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

Side by Side Diff: chrome/browser/views/frame/opaque_browser_frame_view.cc

Issue 113441: ChromeFont->gfx::Font... (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: Created 11 years, 7 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
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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/views/frame/opaque_browser_frame_view.h" 5 #include "chrome/browser/views/frame/opaque_browser_frame_view.h"
6 6
7 #include "app/gfx/chrome_canvas.h" 7 #include "app/gfx/chrome_canvas.h"
8 #include "app/gfx/chrome_font.h" 8 #include "app/gfx/chrome_font.h"
9 #include "app/gfx/path.h" 9 #include "app/gfx/path.h"
10 #include "app/l10n_util.h" 10 #include "app/l10n_util.h"
11 #include "app/resource_bundle.h" 11 #include "app/resource_bundle.h"
12 #include "app/theme_provider.h" 12 #include "app/theme_provider.h"
13 #include "app/win_util.h" 13 #include "app/win_util.h"
14 #include "chrome/browser/browser_theme_provider.h" 14 #include "chrome/browser/browser_theme_provider.h"
15 #include "chrome/browser/views/frame/browser_frame.h" 15 #include "chrome/browser/views/frame/browser_frame.h"
16 #include "chrome/browser/views/frame/browser_view.h" 16 #include "chrome/browser/views/frame/browser_view.h"
17 #include "chrome/browser/views/tabs/tab_strip.h" 17 #include "chrome/browser/views/tabs/tab_strip.h"
18 #include "grit/chromium_strings.h" 18 #include "grit/chromium_strings.h"
19 #include "grit/generated_resources.h" 19 #include "grit/generated_resources.h"
20 #include "grit/theme_resources.h" 20 #include "grit/theme_resources.h"
21 #include "views/controls/button/image_button.h" 21 #include "views/controls/button/image_button.h"
22 #include "views/widget/root_view.h" 22 #include "views/widget/root_view.h"
23 #include "views/window/window_resources.h" 23 #include "views/window/window_resources.h"
24 24
25 // static 25 // static
26 SkBitmap* OpaqueBrowserFrameView::distributor_logo_ = NULL; 26 SkBitmap* OpaqueBrowserFrameView::distributor_logo_ = NULL;
27 ChromeFont* OpaqueBrowserFrameView::title_font_ = NULL; 27 gfx::Font* OpaqueBrowserFrameView::title_font_ = NULL;
28 28
29 namespace { 29 namespace {
30 // The frame border is only visible in restored mode and is hardcoded to 4 px on 30 // The frame border is only visible in restored mode and is hardcoded to 4 px on
31 // each side regardless of the system window border size. 31 // each side regardless of the system window border size.
32 const int kFrameBorderThickness = 4; 32 const int kFrameBorderThickness = 4;
33 // Besides the frame border, there's another 11 px of empty space atop the 33 // Besides the frame border, there's another 11 px of empty space atop the
34 // window in restored mode, to use to drag the window around. 34 // window in restored mode, to use to drag the window around.
35 const int kNonClientRestoredExtraThickness = 11; 35 const int kNonClientRestoredExtraThickness = 11;
36 // While resize areas on Windows are normally the same size as the window 36 // While resize areas on Windows are normally the same size as the window
37 // borders, our top area is shrunk by 1 px to make it easier to move the window 37 // borders, our top area is shrunk by 1 px to make it easier to move the window
(...skipping 903 matching lines...) Expand 10 before | Expand all | Expand 10 after
941 #endif 941 #endif
942 942
943 initialized = true; 943 initialized = true;
944 } 944 }
945 } 945 }
946 946
947 // static 947 // static
948 void OpaqueBrowserFrameView::InitAppWindowResources() { 948 void OpaqueBrowserFrameView::InitAppWindowResources() {
949 static bool initialized = false; 949 static bool initialized = false;
950 if (!initialized) { 950 if (!initialized) {
951 title_font_ = new ChromeFont(win_util::GetWindowTitleFont()); 951 title_font_ = new gfx::Font(win_util::GetWindowTitleFont());
952 initialized = true; 952 initialized = true;
953 } 953 }
954 } 954 }
OLDNEW
« no previous file with comments | « chrome/browser/views/frame/opaque_browser_frame_view.h ('k') | chrome/browser/views/location_bar_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698