diff options
Diffstat (limited to 'chrome/browser/chromeos/webui')
-rw-r--r-- | chrome/browser/chromeos/webui/imageburner_ui.h | 2 | ||||
-rw-r--r-- | chrome/browser/chromeos/webui/keyboard_overlay_ui.cc | 2 | ||||
-rw-r--r-- | chrome/browser/chromeos/webui/keyboard_overlay_ui.h | 2 | ||||
-rw-r--r-- | chrome/browser/chromeos/webui/login/login_ui.cc | 2 | ||||
-rw-r--r-- | chrome/browser/chromeos/webui/login/login_ui.h | 2 | ||||
-rw-r--r-- | chrome/browser/chromeos/webui/menu_ui.h | 2 | ||||
-rw-r--r-- | chrome/browser/chromeos/webui/mobile_setup_ui.cc | 4 | ||||
-rw-r--r-- | chrome/browser/chromeos/webui/register_page_ui.cc | 2 | ||||
-rw-r--r-- | chrome/browser/chromeos/webui/system_info_ui.cc | 6 |
9 files changed, 12 insertions, 12 deletions
diff --git a/chrome/browser/chromeos/webui/imageburner_ui.h b/chrome/browser/chromeos/webui/imageburner_ui.h index e1f1ef20..fc98d7d 100644 --- a/chrome/browser/chromeos/webui/imageburner_ui.h +++ b/chrome/browser/chromeos/webui/imageburner_ui.h @@ -17,10 +17,10 @@ #include "chrome/browser/chromeos/cros/burn_library.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros/mount_library.h" +#include "chrome/browser/dom_ui/chrome_url_data_manager.h" #include "chrome/browser/download/download_item.h" #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 "googleurl/src/gurl.h" #include "net/base/file_stream.h" diff --git a/chrome/browser/chromeos/webui/keyboard_overlay_ui.cc b/chrome/browser/chromeos/webui/keyboard_overlay_ui.cc index 4136c1e..d2cf24b 100644 --- a/chrome/browser/chromeos/webui/keyboard_overlay_ui.cc +++ b/chrome/browser/chromeos/webui/keyboard_overlay_ui.cc @@ -11,9 +11,9 @@ #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros/input_method_library.h" #include "chrome/browser/chromeos/input_method/input_method_util.h" +#include "chrome/browser/dom_ui/chrome_url_data_manager.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/webui/chrome_url_data_manager.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/url_constants.h" #include "grit/browser_resources.h" diff --git a/chrome/browser/chromeos/webui/keyboard_overlay_ui.h b/chrome/browser/chromeos/webui/keyboard_overlay_ui.h index 8cb062f..42d5fd99 100644 --- a/chrome/browser/chromeos/webui/keyboard_overlay_ui.h +++ b/chrome/browser/chromeos/webui/keyboard_overlay_ui.h @@ -8,7 +8,7 @@ #include <string> -#include "chrome/browser/webui/html_dialog_ui.h" +#include "chrome/browser/dom_ui/html_dialog_ui.h" class Browser; class Profile; diff --git a/chrome/browser/chromeos/webui/login/login_ui.cc b/chrome/browser/chromeos/webui/login/login_ui.cc index 7c03804..d9a3371 100644 --- a/chrome/browser/chromeos/webui/login/login_ui.cc +++ b/chrome/browser/chromeos/webui/login/login_ui.cc @@ -14,11 +14,11 @@ #include "chrome/browser/chromeos/webui/login/authenticator_facade_cros.h" #include "chrome/browser/chromeos/webui/login/login_ui.h" #include "chrome/browser/chromeos/webui/login/login_ui_helpers.h" +#include "chrome/browser/dom_ui/chrome_url_data_manager.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" -#include "chrome/browser/webui/chrome_url_data_manager.h" #include "chrome/common/url_constants.h" namespace chromeos { diff --git a/chrome/browser/chromeos/webui/login/login_ui.h b/chrome/browser/chromeos/webui/login/login_ui.h index 58f09bf..094692a 100644 --- a/chrome/browser/chromeos/webui/login/login_ui.h +++ b/chrome/browser/chromeos/webui/login/login_ui.h @@ -10,7 +10,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/dom_ui/chrome_url_data_manager.h" #include "chrome/browser/webui/web_ui.h" class Profile; diff --git a/chrome/browser/chromeos/webui/menu_ui.h b/chrome/browser/chromeos/webui/menu_ui.h index b32e1b6..0cf8be5 100644 --- a/chrome/browser/chromeos/webui/menu_ui.h +++ b/chrome/browser/chromeos/webui/menu_ui.h @@ -8,7 +8,7 @@ #include <string> -#include "chrome/browser/webui/chrome_url_data_manager.h" +#include "chrome/browser/dom_ui/chrome_url_data_manager.h" #include "chrome/browser/webui/web_ui.h" class DictionaryValue; diff --git a/chrome/browser/chromeos/webui/mobile_setup_ui.cc b/chrome/browser/chromeos/webui/mobile_setup_ui.cc index bce623c..642f95e 100644 --- a/chrome/browser/chromeos/webui/mobile_setup_ui.cc +++ b/chrome/browser/chromeos/webui/mobile_setup_ui.cc @@ -16,9 +16,9 @@ #include "base/metrics/histogram.h" #include "base/string_piece.h" #include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "base/threading/thread_restrictions.h" #include "base/timer.h" -#include "base/utf_string_conversions.h" #include "base/values.h" #include "base/weak_ptr.h" #include "chrome/browser/browser_list.h" @@ -26,10 +26,10 @@ #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros/network_library.h" #include "chrome/browser/chromeos/cros/system_library.h" +#include "chrome/browser/dom_ui/chrome_url_data_manager.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/webui/chrome_url_data_manager.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/chromeos/webui/register_page_ui.cc b/chrome/browser/chromeos/webui/register_page_ui.cc index f0dbefc..5f22f91 100644 --- a/chrome/browser/chromeos/webui/register_page_ui.cc +++ b/chrome/browser/chromeos/webui/register_page_ui.cc @@ -20,9 +20,9 @@ #include "chrome/browser/chromeos/customization_document.h" #include "chrome/browser/chromeos/login/wizard_controller.h" #include "chrome/browser/chromeos/version_loader.h" +#include "chrome/browser/dom_ui/chrome_url_data_manager.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/webui/chrome_url_data_manager.h" #include "chrome/common/url_constants.h" #include "googleurl/src/gurl.h" #include "grit/browser_resources.h" diff --git a/chrome/browser/chromeos/webui/system_info_ui.cc b/chrome/browser/chromeos/webui/system_info_ui.cc index 04e3a9c..19fa172 100644 --- a/chrome/browser/chromeos/webui/system_info_ui.cc +++ b/chrome/browser/chromeos/webui/system_info_ui.cc @@ -17,18 +17,18 @@ #include "chrome/browser/browser_thread.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros/syslogs_library.h" +#include "chrome/browser/dom_ui/chrome_url_data_manager.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/webui/chrome_url_data_manager.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/url_constants.h" +#include "net/base/escape.h" +#include "net/base/directory_lister.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" -#include "net/base/directory_lister.h" -#include "net/base/escape.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" |