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

Side by Side Diff: chrome/browser/gtk/tabs/tab_renderer_gtk.cc

Issue 1132006: Move app/gfx/canvas and app/gfx/font to gfx/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 9 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/gtk/tabs/tab_renderer_gtk.h ('k') | chrome/browser/gtk/tabs/tab_strip_gtk.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/gtk/tabs/tab_renderer_gtk.h" 5 #include "chrome/browser/gtk/tabs/tab_renderer_gtk.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 9
10 #include "app/gfx/canvas_paint.h"
11 #include "app/l10n_util.h" 10 #include "app/l10n_util.h"
12 #include "app/resource_bundle.h" 11 #include "app/resource_bundle.h"
13 #include "app/throb_animation.h" 12 #include "app/throb_animation.h"
14 #include "chrome/browser/browser.h" 13 #include "chrome/browser/browser.h"
15 #include "chrome/browser/defaults.h" 14 #include "chrome/browser/defaults.h"
16 #include "chrome/browser/gtk/bookmark_utils_gtk.h" 15 #include "chrome/browser/gtk/bookmark_utils_gtk.h"
17 #include "chrome/browser/gtk/custom_button.h" 16 #include "chrome/browser/gtk/custom_button.h"
18 #include "chrome/browser/gtk/gtk_theme_provider.h" 17 #include "chrome/browser/gtk/gtk_theme_provider.h"
19 #include "chrome/browser/gtk/gtk_util.h" 18 #include "chrome/browser/gtk/gtk_util.h"
20 #include "chrome/browser/profile.h" 19 #include "chrome/browser/profile.h"
21 #include "chrome/browser/tab_contents/tab_contents.h" 20 #include "chrome/browser/tab_contents/tab_contents.h"
22 #include "chrome/common/notification_service.h" 21 #include "chrome/common/notification_service.h"
22 #include "gfx/canvas_paint.h"
23 #include "gfx/favicon_size.h" 23 #include "gfx/favicon_size.h"
24 #include "gfx/skbitmap_operations.h" 24 #include "gfx/skbitmap_operations.h"
25 #include "grit/app_resources.h" 25 #include "grit/app_resources.h"
26 #include "grit/generated_resources.h" 26 #include "grit/generated_resources.h"
27 #include "grit/theme_resources.h" 27 #include "grit/theme_resources.h"
28 28
29 namespace { 29 namespace {
30 30
31 const int kLeftPadding = 16; 31 const int kLeftPadding = 16;
32 const int kTopPadding = 6; 32 const int kTopPadding = 6;
(...skipping 1034 matching lines...) Expand 10 before | Expand all | Expand 10 after
1067 // Force the font size to 9pt, which matches Windows' default font size 1067 // Force the font size to 9pt, which matches Windows' default font size
1068 // (taken from the system). 1068 // (taken from the system).
1069 const gfx::Font& base_font = rb.GetFont(ResourceBundle::BaseFont); 1069 const gfx::Font& base_font = rb.GetFont(ResourceBundle::BaseFont);
1070 title_font_ = new gfx::Font(gfx::Font::CreateFont(base_font.FontName(), 9)); 1070 title_font_ = new gfx::Font(gfx::Font::CreateFont(base_font.FontName(), 9));
1071 title_font_height_ = title_font_->height(); 1071 title_font_height_ = title_font_->height();
1072 1072
1073 crashed_fav_icon = rb.GetBitmapNamed(IDR_SAD_FAVICON); 1073 crashed_fav_icon = rb.GetBitmapNamed(IDR_SAD_FAVICON);
1074 1074
1075 initialized_ = true; 1075 initialized_ = true;
1076 } 1076 }
OLDNEW
« no previous file with comments | « chrome/browser/gtk/tabs/tab_renderer_gtk.h ('k') | chrome/browser/gtk/tabs/tab_strip_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698