Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(169)

Side by Side Diff: chrome/browser/ui/views/tabs/tab_strip.cc

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/views/tabs/tab_strip.h ('k') | chrome/browser/ui/views/theme_background.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/views/tabs/tab_strip.h" 5 #include "chrome/browser/ui/views/tabs/tab_strip.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/stl_util-inl.h" 10 #include "base/stl_util-inl.h"
11 #include "base/utf_string_conversions.h" 11 #include "base/utf_string_conversions.h"
12 #include "chrome/browser/defaults.h" 12 #include "chrome/browser/defaults.h"
13 #include "chrome/browser/themes/browser_theme_provider.h" 13 #include "chrome/browser/themes/browser_theme_provider.h"
14 #include "chrome/browser/ui/view_ids.h" 14 #include "chrome/browser/ui/view_ids.h"
15 #include "chrome/browser/ui/views/tabs/tab.h" 15 #include "chrome/browser/ui/views/tabs/tab.h"
16 #include "chrome/browser/ui/views/tabs/tab_strip_controller.h" 16 #include "chrome/browser/ui/views/tabs/tab_strip_controller.h"
17 #include "gfx/canvas_skia.h"
18 #include "gfx/path.h"
19 #include "gfx/size.h"
20 #include "grit/generated_resources.h" 17 #include "grit/generated_resources.h"
21 #include "grit/theme_resources.h" 18 #include "grit/theme_resources.h"
22 #include "ui/base/animation/animation_container.h" 19 #include "ui/base/animation/animation_container.h"
23 #include "ui/base/dragdrop/drag_drop_types.h" 20 #include "ui/base/dragdrop/drag_drop_types.h"
24 #include "ui/base/l10n/l10n_util.h" 21 #include "ui/base/l10n/l10n_util.h"
25 #include "ui/base/resource/resource_bundle.h" 22 #include "ui/base/resource/resource_bundle.h"
23 #include "ui/gfx/canvas_skia.h"
24 #include "ui/gfx/path.h"
25 #include "ui/gfx/size.h"
26 #include "views/controls/image_view.h" 26 #include "views/controls/image_view.h"
27 #include "views/widget/default_theme_provider.h" 27 #include "views/widget/default_theme_provider.h"
28 #include "views/window/non_client_view.h" 28 #include "views/window/non_client_view.h"
29 #include "views/window/window.h" 29 #include "views/window/window.h"
30 30
31 #if defined(OS_WIN) 31 #if defined(OS_WIN)
32 #include "views/widget/monitor_win.h" 32 #include "views/widget/monitor_win.h"
33 #include "views/widget/widget_win.h" 33 #include "views/widget/widget_win.h"
34 #elif defined(OS_LINUX) 34 #elif defined(OS_LINUX)
35 #include "views/widget/widget_gtk.h" 35 #include "views/widget/widget_gtk.h"
(...skipping 913 matching lines...) Expand 10 before | Expand all | Expand 10 after
949 int TabStrip::GetAvailableWidthForTabs(Tab* last_tab) const { 949 int TabStrip::GetAvailableWidthForTabs(Tab* last_tab) const {
950 return last_tab->x() + last_tab->width(); 950 return last_tab->x() + last_tab->width();
951 } 951 }
952 952
953 bool TabStrip::IsPointInTab(Tab* tab, 953 bool TabStrip::IsPointInTab(Tab* tab,
954 const gfx::Point& point_in_tabstrip_coords) { 954 const gfx::Point& point_in_tabstrip_coords) {
955 gfx::Point point_in_tab_coords(point_in_tabstrip_coords); 955 gfx::Point point_in_tab_coords(point_in_tabstrip_coords);
956 View::ConvertPointToView(this, tab, &point_in_tab_coords); 956 View::ConvertPointToView(this, tab, &point_in_tab_coords);
957 return tab->HitTest(point_in_tab_coords); 957 return tab->HitTest(point_in_tab_coords);
958 } 958 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/tabs/tab_strip.h ('k') | chrome/browser/ui/views/theme_background.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698