diff options
Diffstat (limited to 'chrome/browser/chromeos')
11 files changed, 11 insertions, 11 deletions
diff --git a/chrome/browser/chromeos/login/web_page_view.cc b/chrome/browser/chromeos/login/web_page_view.cc index 4dcc72d..82b44eb 100644 --- a/chrome/browser/chromeos/login/web_page_view.cc +++ b/chrome/browser/chromeos/login/web_page_view.cc @@ -13,8 +13,8 @@ #include "chrome/browser/chromeos/login/helper.h" #include "chrome/browser/chromeos/login/rounded_rect_painter.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/webui/web_ui.h" #include "chrome/common/bindings_policy.h" +#include "content/browser/webui/web_ui.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ipc/ipc_message.h" diff --git a/chrome/browser/chromeos/notifications/system_notification.cc b/chrome/browser/chromeos/notifications/system_notification.cc index 6aacf26..2e5ab14 100644 --- a/chrome/browser/chromeos/notifications/system_notification.cc +++ b/chrome/browser/chromeos/notifications/system_notification.cc @@ -9,7 +9,7 @@ #include "chrome/browser/chromeos/notifications/system_notification_factory.h" #include "chrome/browser/notifications/notification.h" #include "chrome/browser/notifications/notification_ui_manager.h" -#include "chrome/browser/webui/web_ui_util.h" +#include "content/browser/webui/web_ui_util.h" namespace chromeos { diff --git a/chrome/browser/chromeos/webui/accounts_options_handler.cc b/chrome/browser/chromeos/webui/accounts_options_handler.cc index 7ec29f0..d1a4d1d 100644 --- a/chrome/browser/chromeos/webui/accounts_options_handler.cc +++ b/chrome/browser/chromeos/webui/accounts_options_handler.cc @@ -12,8 +12,8 @@ #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/chromeos/user_cros_settings_provider.h" #include "chrome/browser/webui/options/options_managed_banner_handler.h" -#include "chrome/browser/webui/web_ui_util.h" #include "chrome/common/url_constants.h" +#include "content/browser/webui/web_ui_util.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/chromeos/webui/imageburner_ui.h b/chrome/browser/chromeos/webui/imageburner_ui.h index e1f1ef20..ca3c31b 100644 --- a/chrome/browser/chromeos/webui/imageburner_ui.h +++ b/chrome/browser/chromeos/webui/imageburner_ui.h @@ -21,7 +21,7 @@ #include "chrome/browser/download/download_manager.h" #include "chrome/browser/download/download_util.h" #include "chrome/browser/webui/chrome_url_data_manager.h" -#include "chrome/browser/webui/web_ui.h" +#include "content/browser/webui/web_ui.h" #include "googleurl/src/gurl.h" #include "net/base/file_stream.h" #include "ui/base/dragdrop/download_file_interface.h" diff --git a/chrome/browser/chromeos/webui/internet_options_handler.cc b/chrome/browser/chromeos/webui/internet_options_handler.cc index a6c34cd..88c19a2 100644 --- a/chrome/browser/chromeos/webui/internet_options_handler.cc +++ b/chrome/browser/chromeos/webui/internet_options_handler.cc @@ -26,8 +26,8 @@ #include "chrome/browser/chromeos/status/network_menu.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/views/window.h" -#include "chrome/browser/webui/web_ui_util.h" #include "chrome/common/time_format.h" +#include "content/browser/webui/web_ui_util.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/chromeos/webui/login/login_ui.h b/chrome/browser/chromeos/webui/login/login_ui.h index 58f09bf..c40fd9a 100644 --- a/chrome/browser/chromeos/webui/login/login_ui.h +++ b/chrome/browser/chromeos/webui/login/login_ui.h @@ -11,7 +11,7 @@ #include "base/scoped_ptr.h" #include "chrome/browser/chromeos/login/login_status_consumer.h" #include "chrome/browser/webui/chrome_url_data_manager.h" -#include "chrome/browser/webui/web_ui.h" +#include "content/browser/webui/web_ui.h" class Profile; diff --git a/chrome/browser/chromeos/webui/menu_ui.cc b/chrome/browser/chromeos/webui/menu_ui.cc index 7ed1f4a..d3ac25d 100644 --- a/chrome/browser/chromeos/webui/menu_ui.cc +++ b/chrome/browser/chromeos/webui/menu_ui.cc @@ -22,10 +22,10 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_delegate.h" -#include "chrome/browser/webui/web_ui_util.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/url_constants.h" +#include "content/browser/webui/web_ui_util.h" #include "grit/app_resources.h" #include "grit/browser_resources.h" #include "ui/base/models/menu_model.h" diff --git a/chrome/browser/chromeos/webui/menu_ui.h b/chrome/browser/chromeos/webui/menu_ui.h index b32e1b6..736f449 100644 --- a/chrome/browser/chromeos/webui/menu_ui.h +++ b/chrome/browser/chromeos/webui/menu_ui.h @@ -9,7 +9,7 @@ #include <string> #include "chrome/browser/webui/chrome_url_data_manager.h" -#include "chrome/browser/webui/web_ui.h" +#include "content/browser/webui/web_ui.h" class DictionaryValue; diff --git a/chrome/browser/chromeos/webui/mobile_setup_ui.h b/chrome/browser/chromeos/webui/mobile_setup_ui.h index fb00b23..2a2acad 100644 --- a/chrome/browser/chromeos/webui/mobile_setup_ui.h +++ b/chrome/browser/chromeos/webui/mobile_setup_ui.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_WEBUI_MOBILE_SETUP_UI_H_ #pragma once -#include "chrome/browser/webui/web_ui.h" +#include "content/browser/webui/web_ui.h" // A custom WebUI that defines datasource for mobile setup registration page // that is used in Chrome OS activate modem and perform plan subscription tasks. diff --git a/chrome/browser/chromeos/webui/register_page_ui.h b/chrome/browser/chromeos/webui/register_page_ui.h index fdad943..9cf0c1e 100644 --- a/chrome/browser/chromeos/webui/register_page_ui.h +++ b/chrome/browser/chromeos/webui/register_page_ui.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_WEBUI_REGISTER_PAGE_UI_H_ #pragma once -#include "chrome/browser/webui/web_ui.h" +#include "content/browser/webui/web_ui.h" // A custom WebUI that defines datasource for host registration page that // is used in Chrome OS to register product on first sign in. diff --git a/chrome/browser/chromeos/webui/system_info_ui.h b/chrome/browser/chromeos/webui/system_info_ui.h index 68da264..c544ac204c 100644 --- a/chrome/browser/chromeos/webui/system_info_ui.h +++ b/chrome/browser/chromeos/webui/system_info_ui.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_WEBUI_SYSTEM_INFO_UI_H_ #pragma once -#include "chrome/browser/webui/web_ui.h" +#include "content/browser/webui/web_ui.h" class SystemInfoUI : public WebUI { public: |