WebUI: Move chromeos webui files to ui/webui/chromeos directory.
Moving the files found with:
$ ls chrome/browser/chromeos/webui | grep ui
BUG=76120
TEST=None
[email protected],[email protected]
Review URL: http://codereview.chromium.org/6696063
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79278 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/chromeos/webui/imageburner_ui.cc b/chrome/browser/ui/webui/chromeos/imageburner_ui.cc
similarity index 99%
rename from chrome/browser/chromeos/webui/imageburner_ui.cc
rename to chrome/browser/ui/webui/chromeos/imageburner_ui.cc
index 2897c24..670a865 100644
--- a/chrome/browser/chromeos/webui/imageburner_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/imageburner_ui.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/chromeos/webui/imageburner_ui.h"
+#include "chrome/browser/ui/webui/chromeos/imageburner_ui.h"
#include <algorithm>
diff --git a/chrome/browser/chromeos/webui/imageburner_ui.h b/chrome/browser/ui/webui/chromeos/imageburner_ui.h
similarity index 96%
rename from chrome/browser/chromeos/webui/imageburner_ui.h
rename to chrome/browser/ui/webui/chromeos/imageburner_ui.h
index 60c155b..b0e1199 100644
--- a/chrome/browser/chromeos/webui/imageburner_ui.h
+++ b/chrome/browser/ui/webui/chromeos/imageburner_ui.h
@@ -3,8 +3,8 @@
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_CHROMEOS_WEBUI_IMAGEBURNER_UI_H_
-#define CHROME_BROWSER_CHROMEOS_WEBUI_IMAGEBURNER_UI_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_IMAGEBURNER_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_CHROMEOS_IMAGEBURNER_UI_H_
#include <string>
#include <vector>
@@ -179,4 +179,4 @@
DISALLOW_COPY_AND_ASSIGN(ImageBurnUI);
};
-#endif // CHROME_BROWSER_CHROMEOS_WEBUI_IMAGEBURNER_UI_H_
+#endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_IMAGEBURNER_UI_H_
diff --git a/chrome/browser/chromeos/webui/keyboard_overlay_ui.cc b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc
similarity index 99%
rename from chrome/browser/chromeos/webui/keyboard_overlay_ui.cc
rename to chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc
index ab003e61..e64274fc 100644
--- a/chrome/browser/chromeos/webui/keyboard_overlay_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/chromeos/webui/keyboard_overlay_ui.h"
+#include "chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.h"
#include "base/callback.h"
#include "base/values.h"
diff --git a/chrome/browser/chromeos/webui/keyboard_overlay_ui.h b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.h
similarity index 70%
rename from chrome/browser/chromeos/webui/keyboard_overlay_ui.h
rename to chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.h
index 7245665..cc47df7d 100644
--- a/chrome/browser/chromeos/webui/keyboard_overlay_ui.h
+++ b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_CHROMEOS_WEBUI_KEYBOARD_OVERLAY_UI_H_
-#define CHROME_BROWSER_CHROMEOS_WEBUI_KEYBOARD_OVERLAY_UI_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_KEYBOARD_OVERLAY_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_CHROMEOS_KEYBOARD_OVERLAY_UI_H_
#pragma once
#include <string>
@@ -21,4 +21,4 @@
DISALLOW_COPY_AND_ASSIGN(KeyboardOverlayUI);
};
-#endif // CHROME_BROWSER_CHROMEOS_WEBUI_KEYBOARD_OVERLAY_UI_H_
+#endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_KEYBOARD_OVERLAY_UI_H_
diff --git a/chrome/browser/chromeos/webui/mobile_setup_ui.cc b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc
similarity index 99%
rename from chrome/browser/chromeos/webui/mobile_setup_ui.cc
rename to chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc
index 4ec4571..82334529 100644
--- a/chrome/browser/chromeos/webui/mobile_setup_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/chromeos/webui/mobile_setup_ui.h"
+#include "chrome/browser/ui/webui/chromeos/mobile_setup_ui.h"
#include <algorithm>
#include <map>
diff --git a/chrome/browser/chromeos/webui/mobile_setup_ui.h b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.h
similarity index 74%
rename from chrome/browser/chromeos/webui/mobile_setup_ui.h
rename to chrome/browser/ui/webui/chromeos/mobile_setup_ui.h
index 2a2acad..9ea141db 100644
--- a/chrome/browser/chromeos/webui/mobile_setup_ui.h
+++ b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_CHROMEOS_WEBUI_MOBILE_SETUP_UI_H_
-#define CHROME_BROWSER_CHROMEOS_WEBUI_MOBILE_SETUP_UI_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_MOBILE_SETUP_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_CHROMEOS_MOBILE_SETUP_UI_H_
#pragma once
#include "content/browser/webui/web_ui.h"
@@ -18,4 +18,4 @@
DISALLOW_COPY_AND_ASSIGN(MobileSetupUI);
};
-#endif // CHROME_BROWSER_CHROMEOS_WEBUI_MOBILE_SETUP_UI_H_
+#endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_MOBILE_SETUP_UI_H_
diff --git a/chrome/browser/chromeos/webui/proxy_settings_ui.cc b/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc
similarity index 97%
rename from chrome/browser/chromeos/webui/proxy_settings_ui.cc
rename to chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc
index a8ccc19..342a83d 100644
--- a/chrome/browser/chromeos/webui/proxy_settings_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/chromeos/webui/proxy_settings_ui.h"
+#include "chrome/browser/ui/webui/chromeos/proxy_settings_ui.h"
#include "base/message_loop.h"
#include "base/scoped_ptr.h"
diff --git a/chrome/browser/chromeos/webui/proxy_settings_ui.h b/chrome/browser/ui/webui/chromeos/proxy_settings_ui.h
similarity index 79%
rename from chrome/browser/chromeos/webui/proxy_settings_ui.h
rename to chrome/browser/ui/webui/chromeos/proxy_settings_ui.h
index edfff1e..01b699f 100644
--- a/chrome/browser/chromeos/webui/proxy_settings_ui.h
+++ b/chrome/browser/ui/webui/chromeos/proxy_settings_ui.h
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_CHROMEOS_WEBUI_PROXY_SETTINGS_UI_H_
-#define CHROME_BROWSER_CHROMEOS_WEBUI_PROXY_SETTINGS_UI_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_PROXY_SETTINGS_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_CHROMEOS_PROXY_SETTINGS_UI_H_
#pragma once
-#include "content/browser/webui/web_ui.h"
#include "chrome/browser/ui/webui/options/options_ui.h"
+#include "content/browser/webui/web_ui.h"
namespace chromeos {
@@ -28,4 +28,4 @@
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_WEBUI_PROXY_SETTINGS_UI_H_
+#endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_PROXY_SETTINGS_UI_H_
diff --git a/chrome/browser/chromeos/webui/register_page_ui.cc b/chrome/browser/ui/webui/chromeos/register_page_ui.cc
similarity index 99%
rename from chrome/browser/chromeos/webui/register_page_ui.cc
rename to chrome/browser/ui/webui/chromeos/register_page_ui.cc
index 4100c9d..83c01684 100644
--- a/chrome/browser/chromeos/webui/register_page_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/register_page_ui.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/chromeos/webui/register_page_ui.h"
+#include "chrome/browser/ui/webui/chromeos/register_page_ui.h"
#include <string>
diff --git a/chrome/browser/chromeos/webui/register_page_ui.h b/chrome/browser/ui/webui/chromeos/register_page_ui.h
similarity index 73%
rename from chrome/browser/chromeos/webui/register_page_ui.h
rename to chrome/browser/ui/webui/chromeos/register_page_ui.h
index 9cf0c1ed..a0dbcc5 100644
--- a/chrome/browser/chromeos/webui/register_page_ui.h
+++ b/chrome/browser/ui/webui/chromeos/register_page_ui.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_CHROMEOS_WEBUI_REGISTER_PAGE_UI_H_
-#define CHROME_BROWSER_CHROMEOS_WEBUI_REGISTER_PAGE_UI_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_REGISTER_PAGE_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_CHROMEOS_REGISTER_PAGE_UI_H_
#pragma once
#include "content/browser/webui/web_ui.h"
@@ -18,4 +18,4 @@
DISALLOW_COPY_AND_ASSIGN(RegisterPageUI);
};
-#endif // CHROME_BROWSER_CHROMEOS_WEBUI_REGISTER_PAGE_UI_H_
+#endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_REGISTER_PAGE_UI_H_
diff --git a/chrome/browser/chromeos/webui/sim_unlock_ui.cc b/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc
similarity index 98%
rename from chrome/browser/chromeos/webui/sim_unlock_ui.cc
rename to chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc
index e9f13818..43c886e 100644
--- a/chrome/browser/chromeos/webui/sim_unlock_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/chromeos/webui/sim_unlock_ui.h"
+#include "chrome/browser/ui/webui/chromeos/sim_unlock_ui.h"
#include <string>
diff --git a/chrome/browser/chromeos/webui/sim_unlock_ui.h b/chrome/browser/ui/webui/chromeos/sim_unlock_ui.h
similarity index 78%
rename from chrome/browser/chromeos/webui/sim_unlock_ui.h
rename to chrome/browser/ui/webui/chromeos/sim_unlock_ui.h
index 4f39ad5..f6bd2e2 100644
--- a/chrome/browser/chromeos/webui/sim_unlock_ui.h
+++ b/chrome/browser/ui/webui/chromeos/sim_unlock_ui.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_CHROMEOS_WEBUI_SIM_UNLOCK_UI_H_
-#define CHROME_BROWSER_CHROMEOS_WEBUI_SIM_UNLOCK_UI_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_SIM_UNLOCK_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_CHROMEOS_SIM_UNLOCK_UI_H_
#pragma once
#include "content/browser/webui/web_ui.h"
@@ -24,4 +24,4 @@
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_WEBUI_SIM_UNLOCK_UI_H_
+#endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_SIM_UNLOCK_UI_H_
diff --git a/chrome/browser/chromeos/webui/system_info_ui.cc b/chrome/browser/ui/webui/chromeos/system_info_ui.cc
similarity index 98%
rename from chrome/browser/chromeos/webui/system_info_ui.cc
rename to chrome/browser/ui/webui/chromeos/system_info_ui.cc
index f164d35..9c107eac 100644
--- a/chrome/browser/chromeos/webui/system_info_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/system_info_ui.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/chromeos/webui/system_info_ui.h"
+#include "chrome/browser/ui/webui/chromeos/system_info_ui.h"
#include "base/callback.h"
#include "base/message_loop.h"
diff --git a/chrome/browser/chromeos/webui/system_info_ui.h b/chrome/browser/ui/webui/chromeos/system_info_ui.h
similarity index 67%
rename from chrome/browser/chromeos/webui/system_info_ui.h
rename to chrome/browser/ui/webui/chromeos/system_info_ui.h
index c544ac204c..5f116ad0 100644
--- a/chrome/browser/chromeos/webui/system_info_ui.h
+++ b/chrome/browser/ui/webui/chromeos/system_info_ui.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_CHROMEOS_WEBUI_SYSTEM_INFO_UI_H_
-#define CHROME_BROWSER_CHROMEOS_WEBUI_SYSTEM_INFO_UI_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_SYSTEM_INFO_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_CHROMEOS_SYSTEM_INFO_UI_H_
#pragma once
#include "content/browser/webui/web_ui.h"
@@ -16,4 +16,4 @@
DISALLOW_COPY_AND_ASSIGN(SystemInfoUI);
};
-#endif // CHROME_BROWSER_CHROMEOS_WEBUI_SYSTEM_INFO_UI_H_
+#endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_SYSTEM_INFO_UI_H_
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index be9ade8..9536f04 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -685,12 +685,8 @@
'browser/chromeos/webui/cros_language_options_handler.h',
'browser/chromeos/webui/cros_options_page_ui_handler.cc',
'browser/chromeos/webui/cros_options_page_ui_handler.h',
- 'browser/chromeos/webui/imageburner_ui.cc',
- 'browser/chromeos/webui/imageburner_ui.h',
'browser/chromeos/webui/internet_options_handler.cc',
'browser/chromeos/webui/internet_options_handler.h',
- 'browser/chromeos/webui/keyboard_overlay_ui.cc',
- 'browser/chromeos/webui/keyboard_overlay_ui.h',
'browser/chromeos/webui/language_chewing_options_handler.cc',
'browser/chromeos/webui/language_chewing_options_handler.h',
'browser/chromeos/webui/language_customize_modifier_keys_handler.cc',
@@ -714,20 +710,10 @@
'browser/chromeos/webui/login/login_container_ui.h',
'browser/chromeos/webui/login/login_ui_helpers.cc',
'browser/chromeos/webui/login/login_ui_helpers.h',
- 'browser/chromeos/webui/mobile_setup_ui.cc',
- 'browser/chromeos/webui/mobile_setup_ui.h',
'browser/chromeos/webui/proxy_handler.cc',
'browser/chromeos/webui/proxy_handler.h',
- 'browser/chromeos/webui/proxy_settings_ui.cc',
- 'browser/chromeos/webui/proxy_settings_ui.h',
- 'browser/chromeos/webui/register_page_ui.cc',
- 'browser/chromeos/webui/register_page_ui.h',
- 'browser/chromeos/webui/sim_unlock_ui.cc',
- 'browser/chromeos/webui/sim_unlock_ui.h',
'browser/chromeos/webui/stats_options_handler.cc',
'browser/chromeos/webui/stats_options_handler.h',
- 'browser/chromeos/webui/system_info_ui.cc',
- 'browser/chromeos/webui/system_info_ui.h',
'browser/chromeos/webui/system_options_handler.cc',
'browser/chromeos/webui/system_options_handler.h',
'browser/chromeos/webui/system_settings_provider.cc',
@@ -3103,6 +3089,20 @@
'browser/ui/webui/chrome_url_data_manager_backend.h',
'browser/ui/webui/chrome_url_data_manager.cc',
'browser/ui/webui/chrome_url_data_manager.h',
+ 'browser/ui/webui/chromeos/imageburner_ui.cc',
+ 'browser/ui/webui/chromeos/imageburner_ui.h',
+ 'browser/ui/webui/chromeos/keyboard_overlay_ui.cc',
+ 'browser/ui/webui/chromeos/keyboard_overlay_ui.h',
+ 'browser/ui/webui/chromeos/mobile_setup_ui.cc',
+ 'browser/ui/webui/chromeos/mobile_setup_ui.h',
+ 'browser/ui/webui/chromeos/proxy_settings_ui.cc',
+ 'browser/ui/webui/chromeos/proxy_settings_ui.h',
+ 'browser/ui/webui/chromeos/register_page_ui.cc',
+ 'browser/ui/webui/chromeos/register_page_ui.h',
+ 'browser/ui/webui/chromeos/sim_unlock_ui.cc',
+ 'browser/ui/webui/chromeos/sim_unlock_ui.h',
+ 'browser/ui/webui/chromeos/system_info_ui.cc',
+ 'browser/ui/webui/chromeos/system_info_ui.h',
'browser/ui/webui/collected_cookies_ui_delegate.cc',
'browser/ui/webui/collected_cookies_ui_delegate.h',
'browser/ui/webui/constrained_html_ui.cc',
@@ -3292,7 +3292,6 @@
['chromeos==0', {
'sources/': [
['exclude', '^browser/chromeos'],
- ['exclude', 'browser/webui/chrome_about_ui.cc'],
['exclude', 'browser/extensions/extension_tts_api_chromeos.cc'],
['exclude', 'browser/oom_priority_manager.cc'],
['exclude', 'browser/oom_priority_manager.h'],
@@ -3300,6 +3299,8 @@
['exclude', 'browser/policy/device_policy_identity_strategy.h'],
['exclude', 'browser/renderer_host/offline_resource_handler.cc'],
['exclude', 'browser/renderer_host/offline_resource_handler.h'],
+ ['exclude', 'browser/ui/webui/chrome_about_ui.cc'],
+ ['exclude', '^browser/ui/webui/chromeos'],
['exclude', 'browser/ui/webui/collected_cookies_ui_delegate.cc'],
['exclude', 'browser/ui/webui/collected_cookies_ui_delegate.h'],
['exclude', 'browser/ui/webui/cookies_tree_model_adapter.cc'],
diff --git a/content/browser/webui/web_ui_factory.cc b/content/browser/webui/web_ui_factory.cc
index ab627ff1..238b8414 100644
--- a/content/browser/webui/web_ui_factory.cc
+++ b/content/browser/webui/web_ui_factory.cc
@@ -37,13 +37,13 @@
#include "googleurl/src/gurl.h"
#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/webui/imageburner_ui.h"
-#include "chrome/browser/chromeos/webui/keyboard_overlay_ui.h"
-#include "chrome/browser/chromeos/webui/mobile_setup_ui.h"
-#include "chrome/browser/chromeos/webui/proxy_settings_ui.h"
-#include "chrome/browser/chromeos/webui/register_page_ui.h"
-#include "chrome/browser/chromeos/webui/sim_unlock_ui.h"
-#include "chrome/browser/chromeos/webui/system_info_ui.h"
+#include "chrome/browser/ui/webui/chromeos/imageburner_ui.h"
+#include "chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.h"
+#include "chrome/browser/ui/webui/chromeos/mobile_setup_ui.h"
+#include "chrome/browser/ui/webui/chromeos/proxy_settings_ui.h"
+#include "chrome/browser/ui/webui/chromeos/register_page_ui.h"
+#include "chrome/browser/ui/webui/chromeos/sim_unlock_ui.h"
+#include "chrome/browser/ui/webui/chromeos/system_info_ui.h"
#include "chrome/browser/ui/webui/filebrowse_ui.h"
#include "chrome/browser/ui/webui/mediaplayer_ui.h"
#endif
