diff options
Diffstat (limited to 'chrome/browser/chromeos')
5 files changed, 5 insertions, 6 deletions
diff --git a/chrome/browser/chromeos/metrics_cros_settings_provider.cc b/chrome/browser/chromeos/metrics_cros_settings_provider.cc index 9935b65..47759bc 100644 --- a/chrome/browser/chromeos/metrics_cros_settings_provider.cc +++ b/chrome/browser/chromeos/metrics_cros_settings_provider.cc @@ -9,7 +9,7 @@ #include "chrome/browser/chromeos/cros_settings.h" #include "chrome/browser/chromeos/cros_settings_names.h" #include "chrome/browser/chromeos/login/user_manager.h" -#include "chrome/browser/options_util.h" +#include "chrome/browser/ui/options/options_util.h" #include "chrome/installer/util/google_update_settings.h" #if defined(USE_LINUX_BREAKPAD) diff --git a/chrome/browser/chromeos/options/options_window_view.cc b/chrome/browser/chromeos/options/options_window_view.cc index 6a6ac2b..1b909b0 100644 --- a/chrome/browser/chromeos/options/options_window_view.cc +++ b/chrome/browser/chromeos/options/options_window_view.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/options_window.h" - #include "app/l10n_util.h" #include "base/scoped_ptr.h" #include "chrome/browser/browser_process.h" @@ -16,6 +14,7 @@ #include "chrome/browser/profile.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" +#include "chrome/browser/ui/options/options_window.h" #include "chrome/browser/ui/views/accessible_view_helper.h" #include "chrome/browser/ui/views/window.h" #include "chrome/browser/ui/window_sizer.h" diff --git a/chrome/browser/chromeos/tab_closeable_state_watcher.cc b/chrome/browser/chromeos/tab_closeable_state_watcher.cc index 4972079..94aa3cc 100644 --- a/chrome/browser/chromeos/tab_closeable_state_watcher.cc +++ b/chrome/browser/chromeos/tab_closeable_state_watcher.cc @@ -10,8 +10,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/tab_contents_wrapper.h" #include "chrome/browser/tabs/tab_strip_model.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/notification_service.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/chromeos/view_ids.h b/chrome/browser/chromeos/view_ids.h index f8b2794..e32e94e 100644 --- a/chrome/browser/chromeos/view_ids.h +++ b/chrome/browser/chromeos/view_ids.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_VIEW_IDS_H_ #pragma once -#include "chrome/browser/view_ids.h" +#include "chrome/browser/ui/view_ids.h" // View ID used in ChromeOS. enum ChromeOSViewIds { diff --git a/chrome/browser/chromeos/wm_overview_controller.cc b/chrome/browser/chromeos/wm_overview_controller.cc index d4625de..b041bd7 100644 --- a/chrome/browser/chromeos/wm_overview_controller.cc +++ b/chrome/browser/chromeos/wm_overview_controller.cc @@ -19,9 +19,9 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/browser/tab_contents/thumbnail_generator.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/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/common/notification_service.h" #include "views/widget/root_view.h" |