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

Side by Side Diff: chrome/browser/chromeos/login/message_bubble.cc

Issue 4179001: [cros] Fix UI issues on SignIn pod. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 10 years, 1 month 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
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/login/message_bubble.h" 5 #include "chrome/browser/chromeos/login/message_bubble.h"
6 6
7 #include "app/resource_bundle.h" 7 #include "app/resource_bundle.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "chrome/browser/chromeos/login/helper.h"
9 #include "grit/generated_resources.h" 10 #include "grit/generated_resources.h"
10 #include "grit/theme_resources.h" 11 #include "grit/theme_resources.h"
11 #include "views/controls/button/image_button.h" 12 #include "views/controls/button/image_button.h"
12 #include "views/controls/image_view.h" 13 #include "views/controls/image_view.h"
13 #include "views/controls/label.h" 14 #include "views/controls/label.h"
14 #include "views/grid_layout.h" 15 #include "views/grid_layout.h"
15 #include "views/widget/widget.h" 16 #include "views/widget/widget.h"
16 17
17 namespace chromeos { 18 namespace chromeos {
18 19
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 close_button_->SetImage(views::CustomButton::BS_HOT, 72 close_button_->SetImage(views::CustomButton::BS_HOT,
72 rb.GetBitmapNamed(IDR_CLOSE_BAR_H)); 73 rb.GetBitmapNamed(IDR_CLOSE_BAR_H));
73 close_button_->SetImage(views::CustomButton::BS_PUSHED, 74 close_button_->SetImage(views::CustomButton::BS_PUSHED,
74 rb.GetBitmapNamed(IDR_CLOSE_BAR_P)); 75 rb.GetBitmapNamed(IDR_CLOSE_BAR_P));
75 layout->AddView(close_button_); 76 layout->AddView(close_button_);
76 77
77 if (!help.empty()) { 78 if (!help.empty()) {
78 layout->StartRowWithPadding(0, 1, 0, kBorderSize); 79 layout->StartRowWithPadding(0, 1, 0, kBorderSize);
79 help_link_ = new views::Link(help); 80 help_link_ = new views::Link(help);
80 help_link_->SetController(this); 81 help_link_->SetController(this);
82 help_link_->SetNormalColor(login::kLinkColor);
83 help_link_->SetHighlightedColor(login::kLinkColor);
81 layout->AddView(help_link_); 84 layout->AddView(help_link_);
82 } 85 }
83 } 86 }
84 87
85 void MessageBubble::ButtonPressed(views::Button* sender, 88 void MessageBubble::ButtonPressed(views::Button* sender,
86 const views::Event& event) { 89 const views::Event& event) {
87 if (sender == close_button_) { 90 if (sender == close_button_) {
88 Close(); 91 Close();
89 } else { 92 } else {
90 NOTREACHED() << "Unknown view"; 93 NOTREACHED() << "Unknown view";
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 if (grab_enabled_) 149 if (grab_enabled_)
147 WidgetGtk::DoGrab(); 150 WidgetGtk::DoGrab();
148 } 151 }
149 152
150 void MessageBubble::Close() { 153 void MessageBubble::Close() {
151 parent_ = NULL; 154 parent_ = NULL;
152 InfoBubble::Close(); 155 InfoBubble::Close();
153 } 156 }
154 157
155 } // namespace chromeos 158 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/login_screen.cc ('k') | chrome/browser/chromeos/login/network_selection_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698