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

Side by Side Diff: chrome/browser/ui/gtk/tabs/tab_renderer_gtk.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
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/gtk/tabs/tab_renderer_gtk.h" 5 #include "chrome/browser/ui/gtk/tabs/tab_renderer_gtk.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
11 #include "chrome/browser/defaults.h" 11 #include "chrome/browser/defaults.h"
12 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/tab_contents/tab_contents.h" 13 #include "chrome/browser/tab_contents/tab_contents.h"
14 #include "chrome/browser/ui/browser.h" 14 #include "chrome/browser/ui/browser.h"
15 #include "chrome/browser/ui/gtk/bookmark_utils_gtk.h" 15 #include "chrome/browser/ui/gtk/bookmark_utils_gtk.h"
16 #include "chrome/browser/ui/gtk/custom_button.h" 16 #include "chrome/browser/ui/gtk/custom_button.h"
17 #include "chrome/browser/ui/gtk/gtk_theme_provider.h" 17 #include "chrome/browser/ui/gtk/gtk_theme_provider.h"
18 #include "chrome/browser/ui/gtk/gtk_util.h" 18 #include "chrome/browser/ui/gtk/gtk_util.h"
19 #include "chrome/common/notification_service.h" 19 #include "chrome/common/notification_service.h"
20 #include "gfx/canvas_skia_paint.h"
21 #include "gfx/favicon_size.h"
22 #include "gfx/platform_font_gtk.h"
23 #include "gfx/skbitmap_operations.h"
24 #include "grit/app_resources.h" 20 #include "grit/app_resources.h"
25 #include "grit/generated_resources.h" 21 #include "grit/generated_resources.h"
26 #include "grit/theme_resources.h" 22 #include "grit/theme_resources.h"
27 #include "ui/base/animation/slide_animation.h" 23 #include "ui/base/animation/slide_animation.h"
28 #include "ui/base/animation/throb_animation.h" 24 #include "ui/base/animation/throb_animation.h"
29 #include "ui/base/l10n/l10n_util.h" 25 #include "ui/base/l10n/l10n_util.h"
30 #include "ui/base/resource/resource_bundle.h" 26 #include "ui/base/resource/resource_bundle.h"
27 #include "ui/gfx/canvas_skia_paint.h"
28 #include "ui/gfx/favicon_size.h"
29 #include "ui/gfx/platform_font_gtk.h"
30 #include "ui/gfx/skbitmap_operations.h"
31 31
32 namespace { 32 namespace {
33 33
34 const int kFontPixelSize = 13; 34 const int kFontPixelSize = 13;
35 const int kLeftPadding = 16; 35 const int kLeftPadding = 16;
36 const int kTopPadding = 6; 36 const int kTopPadding = 6;
37 const int kRightPadding = 15; 37 const int kRightPadding = 15;
38 const int kBottomPadding = 5; 38 const int kBottomPadding = 5;
39 const int kDropShadowHeight = 2; 39 const int kDropShadowHeight = 2;
40 const int kFavIconTitleSpacing = 4; 40 const int kFavIconTitleSpacing = 4;
(...skipping 1034 matching lines...) Expand 10 before | Expand all | Expand 10 after
1075 1075
1076 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 1076 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
1077 const gfx::Font& base_font = rb.GetFont(ResourceBundle::BaseFont); 1077 const gfx::Font& base_font = rb.GetFont(ResourceBundle::BaseFont);
1078 title_font_ = new gfx::Font(base_font.GetFontName(), kFontPixelSize); 1078 title_font_ = new gfx::Font(base_font.GetFontName(), kFontPixelSize);
1079 title_font_height_ = title_font_->GetHeight(); 1079 title_font_height_ = title_font_->GetHeight();
1080 1080
1081 crashed_fav_icon = rb.GetBitmapNamed(IDR_SAD_FAVICON); 1081 crashed_fav_icon = rb.GetBitmapNamed(IDR_SAD_FAVICON);
1082 1082
1083 initialized_ = true; 1083 initialized_ = true;
1084 } 1084 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/tabs/tab_renderer_gtk.h ('k') | chrome/browser/ui/gtk/tabs/tab_strip_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698