diff options
Diffstat (limited to 'chrome/browser/ui/views/frame')
10 files changed, 19 insertions, 19 deletions
diff --git a/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc b/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc index 21e69b8..fc073ac 100644 --- a/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc @@ -9,15 +9,15 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/views/frame/browser_frame.h" #include "chrome/browser/ui/views/frame/browser_view.h" -#include "gfx/canvas.h" -#include "gfx/font.h" -#include "gfx/path.h" #include "grit/app_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/gfx/canvas.h" +#include "ui/gfx/font.h" +#include "ui/gfx/path.h" #include "views/controls/button/image_button.h" #include "views/window/window.h" #include "views/window/window_resources.h" diff --git a/chrome/browser/ui/views/frame/browser_frame_gtk.cc b/chrome/browser/ui/views/frame/browser_frame_gtk.cc index f1eb9de..d3b7825 100644 --- a/chrome/browser/ui/views/frame/browser_frame_gtk.cc +++ b/chrome/browser/ui/views/frame/browser_frame_gtk.cc @@ -12,7 +12,7 @@ #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" #include "chrome/browser/ui/views/frame/browser_root_view.h" #include "chrome/browser/ui/views/frame/browser_view.h" -#include "gfx/font.h" +#include "ui/gfx/font.h" #include "views/widget/root_view.h" #include "views/window/hit_test.h" diff --git a/chrome/browser/ui/views/frame/browser_frame_win.cc b/chrome/browser/ui/views/frame/browser_frame_win.cc index 1d16015..37a9c80 100644 --- a/chrome/browser/ui/views/frame/browser_frame_win.cc +++ b/chrome/browser/ui/views/frame/browser_frame_win.cc @@ -17,8 +17,8 @@ #include "chrome/browser/ui/views/frame/browser_root_view.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h" -#include "gfx/font.h" #include "grit/theme_resources.h" +#include "ui/gfx/font.h" #include "views/screen.h" #include "views/widget/widget_win.h" #include "views/window/window_delegate.h" diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index b4ff7aa..2171633 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -67,7 +67,6 @@ #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "gfx/canvas_skia.h" #include "grit/app_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" @@ -76,6 +75,7 @@ #include "grit/webkit_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/gfx/canvas_skia.h" #include "views/controls/single_split_view.h" #include "views/focus/external_focus_tracker.h" #include "views/focus/view_storage.h" diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h index bb69a1e..66b35f6 100644 --- a/chrome/browser/ui/views/frame/browser_view.h +++ b/chrome/browser/ui/views/frame/browser_view.h @@ -24,8 +24,8 @@ #include "chrome/browser/ui/views/tabs/tab_strip.h" #include "chrome/browser/ui/views/unhandled_keyboard_event_handler.h" #include "chrome/common/notification_registrar.h" -#include "gfx/native_widget_types.h" #include "ui/base/models/simple_menu_model.h" +#include "ui/gfx/native_widget_types.h" #include "views/controls/single_split_view.h" #include "views/window/client_view.h" #include "views/window/window_delegate.h" diff --git a/chrome/browser/ui/views/frame/browser_view_layout.cc b/chrome/browser/ui/views/frame/browser_view_layout.cc index 60cb81f..dceb562 100644 --- a/chrome/browser/ui/views/frame/browser_view_layout.cc +++ b/chrome/browser/ui/views/frame/browser_view_layout.cc @@ -17,9 +17,9 @@ #include "chrome/browser/ui/views/tabs/side_tab_strip.h" #include "chrome/browser/ui/views/tabs/tab_strip.h" #include "chrome/browser/ui/views/toolbar_view.h" -#include "gfx/scrollbar_size.h" -#include "gfx/point.h" -#include "gfx/size.h" +#include "ui/gfx/point.h" +#include "ui/gfx/scrollbar_size.h" +#include "ui/gfx/size.h" #include "views/controls/single_split_view.h" #include "views/window/window.h" diff --git a/chrome/browser/ui/views/frame/browser_view_layout.h b/chrome/browser/ui/views/frame/browser_view_layout.h index 4554b62..e5049fd 100644 --- a/chrome/browser/ui/views/frame/browser_view_layout.h +++ b/chrome/browser/ui/views/frame/browser_view_layout.h @@ -7,7 +7,7 @@ #pragma once #include "base/basictypes.h" -#include "gfx/rect.h" +#include "ui/gfx/rect.h" #include "views/layout/layout_manager.h" class BaseTabStrip; diff --git a/chrome/browser/ui/views/frame/glass_browser_frame_view.cc b/chrome/browser/ui/views/frame/glass_browser_frame_view.cc index 172e4b5..aa178da 100644 --- a/chrome/browser/ui/views/frame/glass_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/glass_browser_frame_view.cc @@ -11,12 +11,12 @@ #include "chrome/browser/ui/views/tabs/side_tab_strip.h" #include "chrome/browser/ui/views/tabs/tab.h" #include "chrome/browser/ui/views/tabs/tab_strip.h" -#include "gfx/canvas_skia.h" -#include "gfx/icon_util.h" #include "grit/app_resources.h" #include "grit/theme_resources.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" +#include "ui/gfx/canvas_skia.h" +#include "ui/gfx/icon_util.h" #include "views/window/client_view.h" #include "views/window/window_resources.h" diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc index 2f96147..b44265b 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc @@ -12,9 +12,6 @@ #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/tabs/tab_strip.h" #include "chrome/browser/ui/views/toolbar_view.h" -#include "gfx/canvas_skia.h" -#include "gfx/font.h" -#include "gfx/path.h" #include "grit/app_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" @@ -22,6 +19,9 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" +#include "ui/gfx/canvas_skia.h" +#include "ui/gfx/font.h" +#include "ui/gfx/path.h" #include "views/controls/button/image_button.h" #include "views/controls/image_view.h" #include "views/widget/root_view.h" diff --git a/chrome/browser/ui/views/frame/popup_non_client_frame_view.cc b/chrome/browser/ui/views/frame/popup_non_client_frame_view.cc index e0e835d..5951efe 100644 --- a/chrome/browser/ui/views/frame/popup_non_client_frame_view.cc +++ b/chrome/browser/ui/views/frame/popup_non_client_frame_view.cc @@ -5,9 +5,9 @@ #include "chrome/browser/ui/views/frame/popup_non_client_frame_view.h" #include "chrome/browser/ui/views/tabs/base_tab_strip.h" -#include "gfx/point.h" -#include "gfx/rect.h" -#include "gfx/size.h" +#include "ui/gfx/point.h" +#include "ui/gfx/rect.h" +#include "ui/gfx/size.h" #if defined(OS_LINUX) #include "views/window/hit_test.h" |