From 6a3ec231b4a982787a4a1a5fd672bb974ce98bca Mon Sep 17 00:00:00 2001 From: "ben@chromium.org" Date: Thu, 2 Dec 2010 19:30:19 +0000 Subject: Move: tab_menu_model->ui/tabs tab_contents_wrapper->ui/tab_contents view_ids.h->ui status_bubble.h->ui options*->ui/options show_options_url*->ui/options location_bar*->ui/omnibox input_window*->ui browser_uitests->ui/tests BUG=none TEST=none TBR=brettw Review URL: http://codereview.chromium.org/5582002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68047 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/dom_ui/html_dialog_tab_contents_delegate.cc | 2 +- chrome/browser/dom_ui/options/advanced_options_handler.cc | 4 ++-- chrome/browser/dom_ui/options/browser_options_handler.cc | 2 +- chrome/browser/dom_ui/options/options_managed_banner_handler.h | 2 +- chrome/browser/dom_ui/options/personal_options_handler.cc | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'chrome/browser/dom_ui') diff --git a/chrome/browser/dom_ui/html_dialog_tab_contents_delegate.cc b/chrome/browser/dom_ui/html_dialog_tab_contents_delegate.cc index 1ba3c5c..536f84d 100644 --- a/chrome/browser/dom_ui/html_dialog_tab_contents_delegate.cc +++ b/chrome/browser/dom_ui/html_dialog_tab_contents_delegate.cc @@ -6,10 +6,10 @@ #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_navigator.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" // Incognito profiles are not long-lived, so we always want to store a // non-incognito profile. diff --git a/chrome/browser/dom_ui/options/advanced_options_handler.cc b/chrome/browser/dom_ui/options/advanced_options_handler.cc index 91e7ffc..cad6fc2 100644 --- a/chrome/browser/dom_ui/options/advanced_options_handler.cc +++ b/chrome/browser/dom_ui/options/advanced_options_handler.cc @@ -16,8 +16,6 @@ #include "chrome/browser/download/download_prefs.h" #include "chrome/browser/google/google_util.h" #include "chrome/browser/metrics/user_metrics.h" -#include "chrome/browser/options_util.h" -#include "chrome/browser/options_window.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h" @@ -25,6 +23,8 @@ #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_view.h" +#include "chrome/browser/ui/options/options_util.h" +#include "chrome/browser/ui/options/options_window.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" diff --git a/chrome/browser/dom_ui/options/browser_options_handler.cc b/chrome/browser/dom_ui/options/browser_options_handler.cc index d49a534..52aa04b 100644 --- a/chrome/browser/dom_ui/options/browser_options_handler.cc +++ b/chrome/browser/dom_ui/options/browser_options_handler.cc @@ -18,11 +18,11 @@ #include "chrome/browser/instant/instant_confirm_dialog.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/net/url_fixer_upper.h" -#include "chrome/browser/options_window.h" #include "chrome/browser/prefs/session_startup_pref.h" #include "chrome/browser/profile.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_model.h" +#include "chrome/browser/ui/options/options_window.h" #include "chrome/installer/util/browser_distribution.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/dom_ui/options/options_managed_banner_handler.h b/chrome/browser/dom_ui/options/options_managed_banner_handler.h index 6c63484..9cfc5e9 100644 --- a/chrome/browser/dom_ui/options/options_managed_banner_handler.h +++ b/chrome/browser/dom_ui/options/options_managed_banner_handler.h @@ -8,7 +8,7 @@ #include "base/string16.h" #include "chrome/browser/policy/managed_prefs_banner_base.h" -#include "chrome/browser/options_window.h" +#include "chrome/browser/ui/options/options_window.h" class DOMUI; diff --git a/chrome/browser/dom_ui/options/personal_options_handler.cc b/chrome/browser/dom_ui/options/personal_options_handler.cc index 8ef7524..d452219 100644 --- a/chrome/browser/dom_ui/options/personal_options_handler.cc +++ b/chrome/browser/dom_ui/options/personal_options_handler.cc @@ -21,13 +21,13 @@ #if defined(TOOLKIT_GTK) #include "chrome/browser/gtk/gtk_theme_provider.h" #endif // defined(TOOLKIT_GTK) -#include "chrome/browser/options_page_base.h" -#include "chrome/browser/options_window.h" #include "chrome/browser/profile.h" #include "chrome/browser/profile_manager.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/sync_ui_util.h" #include "chrome/browser/themes/browser_theme_provider.h" +#include "chrome/browser/ui/options/options_page_base.h" +#include "chrome/browser/ui/options/options_window.h" #include "chrome/common/net/gaia/google_service_auth_error.h" #include "chrome/common/notification_service.h" #include "chrome/common/chrome_paths.h" -- cgit v1.1