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

Side by Side Diff: ui/message_center/views/message_center_view.cc

Issue 14331002: views: Remove SetHighlightColor usages. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/views/infobars/one_click_signin_infobar.cc ('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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "ui/message_center/views/message_center_view.h" 5 #include "ui/message_center/views/message_center_view.h"
6 6
7 #include <map> 7 #include <map>
8 8
9 #include "grit/ui_strings.h" 9 #include "grit/ui_strings.h"
10 #include "ui/base/l10n/l10n_util.h" 10 #include "ui/base/l10n/l10n_util.h"
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 DISALLOW_COPY_AND_ASSIGN(NotificationCenterButton); 122 DISALLOW_COPY_AND_ASSIGN(NotificationCenterButton);
123 }; 123 };
124 124
125 NotificationCenterButton::NotificationCenterButton( 125 NotificationCenterButton::NotificationCenterButton(
126 views::ButtonListener* listener, 126 views::ButtonListener* listener,
127 const string16& text) 127 const string16& text)
128 : views::TextButton(listener, text) { 128 : views::TextButton(listener, text) {
129 set_border(views::Border::CreateEmptyBorder(0, 16, 0, 16)); 129 set_border(views::Border::CreateEmptyBorder(0, 16, 0, 16));
130 set_min_height(kFooterHeight); 130 set_min_height(kFooterHeight);
131 SetEnabledColor(kFooterTextColor); 131 SetEnabledColor(kFooterTextColor);
132 SetHighlightColor(kButtonTextHighlightColor);
133 SetHoverColor(kButtonTextHoverColor); 132 SetHoverColor(kButtonTextHoverColor);
134 } 133 }
135 134
136 gfx::Size NotificationCenterButton::GetPreferredSize() { 135 gfx::Size NotificationCenterButton::GetPreferredSize() {
137 // Returns an empty size when invisible, to trim its space in the parent's 136 // Returns an empty size when invisible, to trim its space in the parent's
138 // GridLayout. 137 // GridLayout.
139 if (!visible()) 138 if (!visible())
140 return gfx::Size(); 139 return gfx::Size();
141 return views::TextButton::GetPreferredSize(); 140 return views::TextButton::GetPreferredSize();
142 } 141 }
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
450 // NotificationViews are expanded by default here until 449 // NotificationViews are expanded by default here until
451 // http://crbug.com/217902 is fixed. TODO(dharcourt): Fix. 450 // http://crbug.com/217902 is fixed. TODO(dharcourt): Fix.
452 MessageView* view = NotificationView::Create( 451 MessageView* view = NotificationView::Create(
453 notification, message_center_, true); 452 notification, message_center_, true);
454 view->set_scroller(scroller_); 453 view->set_scroller(scroller_);
455 message_views_[notification.id()] = view; 454 message_views_[notification.id()] = view;
456 message_list_view_->AddChildView(view); 455 message_list_view_->AddChildView(view);
457 } 456 }
458 457
459 } // namespace message_center 458 } // namespace message_center
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/infobars/one_click_signin_infobar.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698