summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/chromeos')
-rw-r--r--chrome/browser/chromeos/login/login_html_dialog.h4
-rw-r--r--chrome/browser/chromeos/webui/imageburner_ui.h2
-rw-r--r--chrome/browser/chromeos/webui/keyboard_overlay_ui.cc2
-rw-r--r--chrome/browser/chromeos/webui/keyboard_overlay_ui.h2
-rw-r--r--chrome/browser/chromeos/webui/login/login_ui.cc2
-rw-r--r--chrome/browser/chromeos/webui/login/login_ui.h2
-rw-r--r--chrome/browser/chromeos/webui/menu_ui.h2
-rw-r--r--chrome/browser/chromeos/webui/mobile_setup_ui.cc4
-rw-r--r--chrome/browser/chromeos/webui/register_page_ui.cc2
-rw-r--r--chrome/browser/chromeos/webui/system_info_ui.cc6
10 files changed, 14 insertions, 14 deletions
diff --git a/chrome/browser/chromeos/login/login_html_dialog.h b/chrome/browser/chromeos/login/login_html_dialog.h
index d1ee19d..4d95756 100644
--- a/chrome/browser/chromeos/login/login_html_dialog.h
+++ b/chrome/browser/chromeos/login/login_html_dialog.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -8,7 +8,7 @@
#include <string>
-#include "chrome/browser/dom_ui/html_dialog_ui.h"
+#include "chrome/browser/webui/html_dialog_ui.h"
#include "chrome/common/notification_observer.h"
#include "chrome/common/notification_registrar.h"
#include "ui/gfx/native_widget_types.h"
diff --git a/chrome/browser/chromeos/webui/imageburner_ui.h b/chrome/browser/chromeos/webui/imageburner_ui.h
index fc98d7d..e1f1ef20 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 d2cf24b..4136c1e 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 42d5fd99..8cb062f 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/dom_ui/html_dialog_ui.h"
+#include "chrome/browser/webui/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 d9a3371..7c03804 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 094692a..58f09bf 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/dom_ui/chrome_url_data_manager.h"
+#include "chrome/browser/webui/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 0cf8be5..b32e1b6 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/dom_ui/chrome_url_data_manager.h"
+#include "chrome/browser/webui/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 642f95e..bce623c 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 5f22f91..f0dbefc 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 19fa172..04e3a9c 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"