diff options
Diffstat (limited to 'chrome/browser/views/tabs')
-rw-r--r-- | chrome/browser/views/tabs/dragged_tab_controller.cc | 4 | ||||
-rw-r--r-- | chrome/browser/views/tabs/dragged_tab_view.cc | 2 | ||||
-rw-r--r-- | chrome/browser/views/tabs/dragged_tab_view.h | 2 | ||||
-rw-r--r-- | chrome/browser/views/tabs/hwnd_photobooth.cc | 2 | ||||
-rw-r--r-- | chrome/browser/views/tabs/tab.cc | 6 | ||||
-rw-r--r-- | chrome/browser/views/tabs/tab_dragging_test.cc | 2 | ||||
-rw-r--r-- | chrome/browser/views/tabs/tab_renderer.cc | 6 | ||||
-rw-r--r-- | chrome/browser/views/tabs/tab_renderer.h | 6 | ||||
-rw-r--r-- | chrome/browser/views/tabs/tab_strip.cc | 8 | ||||
-rw-r--r-- | chrome/browser/views/tabs/tab_strip.h | 8 |
10 files changed, 23 insertions, 23 deletions
diff --git a/chrome/browser/views/tabs/dragged_tab_controller.cc b/chrome/browser/views/tabs/dragged_tab_controller.cc index c53622f..56ed9c7 100644 --- a/chrome/browser/views/tabs/dragged_tab_controller.cc +++ b/chrome/browser/views/tabs/dragged_tab_controller.cc @@ -21,10 +21,10 @@ #include "chrome/browser/views/tabs/tab_strip.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/notification_service.h" -#include "chrome/views/event.h" -#include "chrome/views/widget/root_view.h" #include "grit/theme_resources.h" #include "skia/include/SkBitmap.h" +#include "views/event.h" +#include "views/widget/root_view.h" static const int kHorizontalMoveThreshold = 16; // pixels diff --git a/chrome/browser/views/tabs/dragged_tab_view.cc b/chrome/browser/views/tabs/dragged_tab_view.cc index 90e6d23..1977f56 100644 --- a/chrome/browser/views/tabs/dragged_tab_view.cc +++ b/chrome/browser/views/tabs/dragged_tab_view.cc @@ -9,8 +9,8 @@ #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/views/tabs/hwnd_photobooth.h" #include "chrome/browser/views/tabs/tab_renderer.h" -#include "chrome/views/widget/widget_win.h" #include "skia/include/SkShader.h" +#include "views/widget/widget_win.h" const int kTransparentAlpha = 200; const int kOpaqueAlpha = 255; diff --git a/chrome/browser/views/tabs/dragged_tab_view.h b/chrome/browser/views/tabs/dragged_tab_view.h index 5802ec2..1b55654 100644 --- a/chrome/browser/views/tabs/dragged_tab_view.h +++ b/chrome/browser/views/tabs/dragged_tab_view.h @@ -9,8 +9,8 @@ #include "base/gfx/point.h" #include "base/gfx/size.h" #include "base/task.h" -#include "chrome/views/view.h" #include "skia/include/SkBitmap.h" +#include "views/view.h" namespace views { class WidgetWin; diff --git a/chrome/browser/views/tabs/hwnd_photobooth.cc b/chrome/browser/views/tabs/hwnd_photobooth.cc index ba825b0..8d59592 100644 --- a/chrome/browser/views/tabs/hwnd_photobooth.cc +++ b/chrome/browser/views/tabs/hwnd_photobooth.cc @@ -6,8 +6,8 @@ #include "base/gfx/point.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/views/tabs/hwnd_photobooth.h" -#include "chrome/views/widget/widget_win.h" #include "skia/include/SkBitmap.h" +#include "views/widget/widget_win.h" namespace { diff --git a/chrome/browser/views/tabs/tab.cc b/chrome/browser/views/tabs/tab.cc index f2193dc..3975604 100644 --- a/chrome/browser/views/tabs/tab.cc +++ b/chrome/browser/views/tabs/tab.cc @@ -9,10 +9,10 @@ #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/gfx/size.h" -#include "chrome/views/controls/menu/chrome_menu.h" -#include "chrome/views/widget/tooltip_manager.h" -#include "chrome/views/widget/widget.h" #include "grit/generated_resources.h" +#include "views/controls/menu/chrome_menu.h" +#include "views/widget/tooltip_manager.h" +#include "views/widget/widget.h" const std::string Tab::kTabClassName = "browser/tabs/Tab"; diff --git a/chrome/browser/views/tabs/tab_dragging_test.cc b/chrome/browser/views/tabs/tab_dragging_test.cc index 94ea24d..18226a1 100644 --- a/chrome/browser/views/tabs/tab_dragging_test.cc +++ b/chrome/browser/views/tabs/tab_dragging_test.cc @@ -13,9 +13,9 @@ #include "chrome/test/automation/browser_proxy.h" #include "chrome/test/automation/window_proxy.h" #include "chrome/test/ui/ui_test.h" -#include "chrome/views/event.h" #include "googleurl/src/gurl.h" #include "net/base/net_util.h" +#include "views/event.h" class TabDraggingTest : public UITest { diff --git a/chrome/browser/views/tabs/tab_renderer.cc b/chrome/browser/views/tabs/tab_renderer.cc index ca69bdd..9bb88ae 100644 --- a/chrome/browser/views/tabs/tab_renderer.cc +++ b/chrome/browser/views/tabs/tab_renderer.cc @@ -15,12 +15,12 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/common/win_util.h" -#include "chrome/views/widget/widget.h" -#include "chrome/views/window/non_client_view.h" -#include "chrome/views/window/window.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "skia/ext/image_operations.h" +#include "views/widget/widget.h" +#include "views/window/non_client_view.h" +#include "views/window/window.h" static const int kLeftPadding = 16; static const int kTopPadding = 6; diff --git a/chrome/browser/views/tabs/tab_renderer.h b/chrome/browser/views/tabs/tab_renderer.h index 67c4639..f498c2a 100644 --- a/chrome/browser/views/tabs/tab_renderer.h +++ b/chrome/browser/views/tabs/tab_renderer.h @@ -9,9 +9,9 @@ #include "app/slide_animation.h" #include "app/throb_animation.h" #include "base/gfx/point.h" -#include "chrome/views/controls/button/image_button.h" -#include "chrome/views/controls/menu/menu.h" -#include "chrome/views/view.h" +#include "views/controls/button/image_button.h" +#include "views/controls/menu/menu.h" +#include "views/view.h" class TabContents; diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc index 5f41cc8..365e000 100644 --- a/chrome/browser/views/tabs/tab_strip.cc +++ b/chrome/browser/views/tabs/tab_strip.cc @@ -23,12 +23,12 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/pref_names.h" #include "chrome/common/win_util.h" -#include "chrome/views/controls/image_view.h" -#include "chrome/views/painter.h" -#include "chrome/views/window/non_client_view.h" -#include "chrome/views/window/window.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "views/controls/image_view.h" +#include "views/painter.h" +#include "views/window/non_client_view.h" +#include "views/window/window.h" #undef min #undef max diff --git a/chrome/browser/views/tabs/tab_strip.h b/chrome/browser/views/tabs/tab_strip.h index 8e10b5e..1c52a45 100644 --- a/chrome/browser/views/tabs/tab_strip.h +++ b/chrome/browser/views/tabs/tab_strip.h @@ -8,10 +8,10 @@ #include "base/gfx/point.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/views/tabs/tab.h" -#include "chrome/views/controls/button/image_button.h" -#include "chrome/views/controls/menu/menu.h" -#include "chrome/views/view.h" -#include "chrome/views/widget/widget_win.h" +#include "views/controls/button/image_button.h" +#include "views/controls/menu/menu.h" +#include "views/view.h" +#include "views/widget/widget_win.h" class DraggedTabController; class ScopedMouseCloseWidthCalculator; |