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

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

Issue 2541873004: Change default frame colors. Change custom titlebar colors on Windows. (Closed)
Patch Set: Created 4 years 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 538 matching lines...) Expand 10 before | Expand all | Expand 10 after
549 return ShouldCustomDrawSystemTitlebar() && 549 return ShouldCustomDrawSystemTitlebar() &&
550 browser_view()->ShouldShowWindowTitle(); 550 browser_view()->ShouldShowWindowTitle();
551 } 551 }
552 552
553 bool GlassBrowserFrameView::ShowSystemIcon() const { 553 bool GlassBrowserFrameView::ShowSystemIcon() const {
554 return !ShouldCustomDrawSystemTitlebar() && 554 return !ShouldCustomDrawSystemTitlebar() &&
555 browser_view()->ShouldShowWindowIcon(); 555 browser_view()->ShouldShowWindowIcon();
556 } 556 }
557 557
558 SkColor GlassBrowserFrameView::GetTitlebarColor() const { 558 SkColor GlassBrowserFrameView::GetTitlebarColor() const {
559 return GetThemeProvider()->GetColor(ThemeProperties::COLOR_FRAME); 559 const ui::ThemeProvider* tp = GetThemeProvider();
560 return ShouldPaintAsActive()
561 ? tp->GetColor(ThemeProperties::COLOR_FRAME)
562 : tp->GetColor(ThemeProperties::COLOR_FRAME_INACTIVE);
560 } 563 }
561 564
562 Windows10CaptionButton* GlassBrowserFrameView::CreateCaptionButton( 565 Windows10CaptionButton* GlassBrowserFrameView::CreateCaptionButton(
563 ViewID button_type) { 566 ViewID button_type) {
564 Windows10CaptionButton* button = 567 Windows10CaptionButton* button =
565 new Windows10CaptionButton(this, button_type); 568 new Windows10CaptionButton(this, button_type);
566 AddChildView(button); 569 AddChildView(button);
567 return button; 570 return button;
568 } 571 }
569 572
(...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
911 static bool initialized = false; 914 static bool initialized = false;
912 if (!initialized) { 915 if (!initialized) {
913 for (int i = 0; i < kThrobberIconCount; ++i) { 916 for (int i = 0; i < kThrobberIconCount; ++i) {
914 throbber_icons_[i] = 917 throbber_icons_[i] =
915 ui::LoadThemeIconFromResourcesDataDLL(IDI_THROBBER_01 + i); 918 ui::LoadThemeIconFromResourcesDataDLL(IDI_THROBBER_01 + i);
916 DCHECK(throbber_icons_[i]); 919 DCHECK(throbber_icons_[i]);
917 } 920 }
918 initialized = true; 921 initialized = true;
919 } 922 }
920 } 923 }
OLDNEW
« chrome/browser/themes/theme_service_win.cc ('K') | « chrome/browser/themes/theme_service_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698