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

Side by Side Diff: chrome/browser/ui/views/frame/glass_browser_frame_view.cc

Issue 2734113006: "Bootstrap" a toolkit-views Typography spec. (Closed)
Patch Set: Rebase (conflict in layout_delegate.h due to r457774) Created 3 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/frame/glass_browser_frame_view.h" 5 #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h"
6 6
7 #include <dwmapi.h> 7 #include <dwmapi.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/win/windows_version.h" 10 #include "base/win/windows_version.h"
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 111
112 window_icon_ = new TabIconView(this, nullptr); 112 window_icon_ = new TabIconView(this, nullptr);
113 window_icon_->set_is_light(true); 113 window_icon_->set_is_light(true);
114 window_icon_->set_id(VIEW_ID_WINDOW_ICON); 114 window_icon_->set_id(VIEW_ID_WINDOW_ICON);
115 AddChildView(window_icon_); 115 AddChildView(window_icon_);
116 } 116 }
117 117
118 if (browser_view->ShouldShowWindowTitle()) { 118 if (browser_view->ShouldShowWindowTitle()) {
119 window_title_ = 119 window_title_ =
120 new views::Label(browser_view->GetWindowTitle(), 120 new views::Label(browser_view->GetWindowTitle(),
121 gfx::FontList(BrowserFrame::GetTitleFontList())); 121 {gfx::FontList(BrowserFrame::GetTitleFontList())});
122 window_title_->SetSubpixelRenderingEnabled(false); 122 window_title_->SetSubpixelRenderingEnabled(false);
123 window_title_->SetHorizontalAlignment(gfx::ALIGN_LEFT); 123 window_title_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
124 window_title_->set_id(VIEW_ID_WINDOW_TITLE); 124 window_title_->set_id(VIEW_ID_WINDOW_TITLE);
125 AddChildView(window_title_); 125 AddChildView(window_title_);
126 } 126 }
127 127
128 minimize_button_ = CreateCaptionButton(VIEW_ID_MINIMIZE_BUTTON); 128 minimize_button_ = CreateCaptionButton(VIEW_ID_MINIMIZE_BUTTON);
129 maximize_button_ = CreateCaptionButton(VIEW_ID_MAXIMIZE_BUTTON); 129 maximize_button_ = CreateCaptionButton(VIEW_ID_MAXIMIZE_BUTTON);
130 restore_button_ = CreateCaptionButton(VIEW_ID_RESTORE_BUTTON); 130 restore_button_ = CreateCaptionButton(VIEW_ID_RESTORE_BUTTON);
131 close_button_ = CreateCaptionButton(VIEW_ID_CLOSE_BUTTON); 131 close_button_ = CreateCaptionButton(VIEW_ID_CLOSE_BUTTON);
(...skipping 783 matching lines...) Expand 10 before | Expand all | Expand 10 after
915 static bool initialized = false; 915 static bool initialized = false;
916 if (!initialized) { 916 if (!initialized) {
917 for (int i = 0; i < kThrobberIconCount; ++i) { 917 for (int i = 0; i < kThrobberIconCount; ++i) {
918 throbber_icons_[i] = 918 throbber_icons_[i] =
919 ui::LoadThemeIconFromResourcesDataDLL(IDI_THROBBER_01 + i); 919 ui::LoadThemeIconFromResourcesDataDLL(IDI_THROBBER_01 + i);
920 DCHECK(throbber_icons_[i]); 920 DCHECK(throbber_icons_[i]);
921 } 921 }
922 initialized = true; 922 initialized = true;
923 } 923 }
924 } 924 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698