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

Side by Side Diff: chrome/browser/chromeos/ui/idle_app_name_notification_view.cc

Issue 2910153002: Remove views::Label::SetDisabledColor(). Replace with typography colors. (Closed)
Patch Set: rebase for r476345 Created 3 years, 6 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/chromeos/ui/idle_app_name_notification_view.h" 5 #include "chrome/browser/chromeos/ui/idle_app_name_notification_view.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "ash/public/cpp/shell_window_ids.h" 9 #include "ash/public/cpp/shell_window_ids.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 private: 184 private:
185 // Adds the label to the view, using |text| with a |font| and a |text_color|. 185 // Adds the label to the view, using |text| with a |font| and a |text_color|.
186 void AddLabel(const base::string16& text, 186 void AddLabel(const base::string16& text,
187 const gfx::FontList& font, 187 const gfx::FontList& font,
188 SkColor text_color) { 188 SkColor text_color) {
189 views::Label* label = new views::Label; 189 views::Label* label = new views::Label;
190 label->SetText(text); 190 label->SetText(text);
191 label->SetHorizontalAlignment(gfx::ALIGN_CENTER); 191 label->SetHorizontalAlignment(gfx::ALIGN_CENTER);
192 label->SetFontList(font); 192 label->SetFontList(font);
193 label->SetEnabledColor(text_color); 193 label->SetEnabledColor(text_color);
194 label->SetDisabledColor(text_color);
sky 2017/06/02 14:14:22 I'm going to assume this was never needed either.
tapted 2017/06/03 09:46:55 Acknowledged.
195 label->SetAutoColorReadabilityEnabled(false); 194 label->SetAutoColorReadabilityEnabled(false);
196 AddChildView(label); 195 AddChildView(label);
197 } 196 }
198 197
199 // A timer which calls us to remove the message from the screen. 198 // A timer which calls us to remove the message from the screen.
200 base::OneShotTimer hide_timer_; 199 base::OneShotTimer hide_timer_;
201 200
202 // The owner of this message which needs to get notified when the message 201 // The owner of this message which needs to get notified when the message
203 // closes. 202 // closes.
204 IdleAppNameNotificationView* owner_; 203 IdleAppNameNotificationView* owner_;
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 261
263 view_ = new IdleAppNameNotificationDelegateView( 262 view_ = new IdleAppNameNotificationDelegateView(
264 this, 263 this,
265 app_name, 264 app_name,
266 error, 265 error,
267 message_visibility_time_in_ms + animation_time_ms); 266 message_visibility_time_in_ms + animation_time_ms);
268 CreateAndShowWidget(view_, animation_time_ms); 267 CreateAndShowWidget(view_, animation_time_ms);
269 } 268 }
270 269
271 } // namespace chromeos 270 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698