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

Side by Side Diff: ash/system/tray/tray_popup_item_style.cc

Issue 2978363002: Revert of Add a row in the network tray to inform users to turn Bluetooth on to enable Tether. (Closed)
Patch Set: Created 3 years, 5 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
« no previous file with comments | « ash/system/tray/tray_popup_item_style.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "ash/system/tray/tray_popup_item_style.h" 5 #include "ash/system/tray/tray_popup_item_style.h"
6 6
7 #include "third_party/skia/include/core/SkColor.h" 7 #include "third_party/skia/include/core/SkColor.h"
8 #include "ui/gfx/color_palette.h" 8 #include "ui/gfx/color_palette.h"
9 #include "ui/gfx/font.h" 9 #include "ui/gfx/font.h"
10 #include "ui/gfx/font_list.h" 10 #include "ui/gfx/font_list.h"
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 gfx::Font::Weight::MEDIUM)); 82 gfx::Font::Weight::MEDIUM));
83 label->SetEnabledColor(label->GetNativeTheme()->GetSystemColor( 83 label->SetEnabledColor(label->GetNativeTheme()->GetSystemColor(
84 ui::NativeTheme::kColorId_ProminentButtonColor)); 84 ui::NativeTheme::kColorId_ProminentButtonColor));
85 label->SetAutoColorReadabilityEnabled(false); 85 label->SetAutoColorReadabilityEnabled(false);
86 break; 86 break;
87 case FontStyle::DETAILED_VIEW_LABEL: 87 case FontStyle::DETAILED_VIEW_LABEL:
88 case FontStyle::SYSTEM_INFO: 88 case FontStyle::SYSTEM_INFO:
89 label->SetFontList(base_font_list.Derive(1, gfx::Font::NORMAL, 89 label->SetFontList(base_font_list.Derive(1, gfx::Font::NORMAL,
90 gfx::Font::Weight::NORMAL)); 90 gfx::Font::Weight::NORMAL));
91 break; 91 break;
92 case FontStyle::CLICKABLE_SYSTEM_INFO:
93 label->SetFontList(base_font_list.Derive(1, gfx::Font::NORMAL,
94 gfx::Font::Weight::NORMAL));
95 label->SetEnabledColor(label->GetNativeTheme()->GetSystemColor(
96 ui::NativeTheme::kColorId_ProminentButtonColor));
97 label->SetAutoColorReadabilityEnabled(false);
98 break;
99 case FontStyle::BUTTON: 92 case FontStyle::BUTTON:
100 label->SetFontList(base_font_list.Derive(0, gfx::Font::NORMAL, 93 label->SetFontList(base_font_list.Derive(0, gfx::Font::NORMAL,
101 gfx::Font::Weight::MEDIUM)); 94 gfx::Font::Weight::MEDIUM));
102 break; 95 break;
103 case FontStyle::CAPTION: 96 case FontStyle::CAPTION:
104 label->SetFontList(base_font_list.Derive(0, gfx::Font::NORMAL, 97 label->SetFontList(base_font_list.Derive(0, gfx::Font::NORMAL,
105 gfx::Font::Weight::NORMAL)); 98 gfx::Font::Weight::NORMAL));
106 break; 99 break;
107 } 100 }
108 } 101 }
109 102
110 } // namespace ash 103 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/tray/tray_popup_item_style.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698