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

Side by Side Diff: chrome/browser/ui/views/tabs/tab.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.h ('k') | chrome/browser/ui/views/tabs/tab_dragging_test.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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.h" 5 #include "chrome/browser/ui/views/tabs/tab.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/defaults.h" 10 #include "chrome/browser/defaults.h"
11 #include "chrome/browser/themes/browser_theme_provider.h" 11 #include "chrome/browser/themes/browser_theme_provider.h"
12 #include "gfx/canvas_skia.h"
13 #include "gfx/favicon_size.h"
14 #include "gfx/font.h"
15 #include "gfx/path.h"
16 #include "gfx/skbitmap_operations.h"
17 #include "grit/app_resources.h" 12 #include "grit/app_resources.h"
18 #include "grit/generated_resources.h" 13 #include "grit/generated_resources.h"
19 #include "grit/theme_resources.h" 14 #include "grit/theme_resources.h"
20 #include "third_party/skia/include/effects/SkGradientShader.h" 15 #include "third_party/skia/include/effects/SkGradientShader.h"
21 #include "ui/base/animation/multi_animation.h" 16 #include "ui/base/animation/multi_animation.h"
22 #include "ui/base/animation/slide_animation.h" 17 #include "ui/base/animation/slide_animation.h"
23 #include "ui/base/animation/throb_animation.h" 18 #include "ui/base/animation/throb_animation.h"
24 #include "ui/base/resource/resource_bundle.h" 19 #include "ui/base/resource/resource_bundle.h"
20 #include "ui/gfx/canvas_skia.h"
21 #include "ui/gfx/favicon_size.h"
22 #include "ui/gfx/font.h"
23 #include "ui/gfx/path.h"
24 #include "ui/gfx/skbitmap_operations.h"
25 #include "views/controls/button/image_button.h" 25 #include "views/controls/button/image_button.h"
26 #include "views/widget/tooltip_manager.h" 26 #include "views/widget/tooltip_manager.h"
27 #include "views/widget/widget.h" 27 #include "views/widget/widget.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 static const int kLeftPadding = 16; 31 static const int kLeftPadding = 16;
32 static const int kTopPadding = 6; 32 static const int kTopPadding = 6;
33 static const int kRightPadding = 15; 33 static const int kRightPadding = 15;
34 static const int kBottomPadding = 5; 34 static const int kBottomPadding = 5;
(...skipping 632 matching lines...) Expand 10 before | Expand all | Expand 10 after
667 tab_active_.image_r = rb.GetBitmapNamed(IDR_TAB_ACTIVE_RIGHT); 667 tab_active_.image_r = rb.GetBitmapNamed(IDR_TAB_ACTIVE_RIGHT);
668 tab_active_.l_width = tab_active_.image_l->width(); 668 tab_active_.l_width = tab_active_.image_l->width();
669 tab_active_.r_width = tab_active_.image_r->width(); 669 tab_active_.r_width = tab_active_.image_r->width();
670 670
671 tab_inactive_.image_l = rb.GetBitmapNamed(IDR_TAB_INACTIVE_LEFT); 671 tab_inactive_.image_l = rb.GetBitmapNamed(IDR_TAB_INACTIVE_LEFT);
672 tab_inactive_.image_c = rb.GetBitmapNamed(IDR_TAB_INACTIVE_CENTER); 672 tab_inactive_.image_c = rb.GetBitmapNamed(IDR_TAB_INACTIVE_CENTER);
673 tab_inactive_.image_r = rb.GetBitmapNamed(IDR_TAB_INACTIVE_RIGHT); 673 tab_inactive_.image_r = rb.GetBitmapNamed(IDR_TAB_INACTIVE_RIGHT);
674 tab_inactive_.l_width = tab_inactive_.image_l->width(); 674 tab_inactive_.l_width = tab_inactive_.image_l->width();
675 tab_inactive_.r_width = tab_inactive_.image_r->width(); 675 tab_inactive_.r_width = tab_inactive_.image_r->width();
676 } 676 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/tabs/tab.h ('k') | chrome/browser/ui/views/tabs/tab_dragging_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698