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

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

Issue 9307099: chromeos/aura: Make login screen status area font non-bold. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 8 years, 10 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
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/chromeos/login/webui_login_view.h" 5 #include "chrome/browser/chromeos/login/webui_login_view.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/i18n/rtl.h" 9 #include "base/i18n/rtl.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 const views::View* button_view, int command_id) { 262 const views::View* button_view, int command_id) {
263 if (command_id == StatusAreaButton::Delegate::SHOW_NETWORK_OPTIONS) { 263 if (command_id == StatusAreaButton::Delegate::SHOW_NETWORK_OPTIONS) {
264 if (proxy_settings_dialog_.get() == NULL) { 264 if (proxy_settings_dialog_.get() == NULL) {
265 proxy_settings_dialog_.reset(new ProxySettingsDialog(NULL, 265 proxy_settings_dialog_.reset(new ProxySettingsDialog(NULL,
266 GetNativeWindow())); 266 GetNativeWindow()));
267 } 267 }
268 proxy_settings_dialog_->Show(); 268 proxy_settings_dialog_->Show();
269 } 269 }
270 } 270 }
271 271
272 gfx::Font WebUILoginView::GetStatusAreaFont(const gfx::Font& font) const {
273 return font;
274 }
275
276 StatusAreaButton::TextStyle WebUILoginView::GetStatusAreaTextStyle() const { 272 StatusAreaButton::TextStyle WebUILoginView::GetStatusAreaTextStyle() const {
277 return StatusAreaButton::GRAY_PLAIN; 273 return StatusAreaButton::GRAY_PLAIN_LIGHT;
278 } 274 }
279 275
280 void WebUILoginView::ButtonVisibilityChanged(views::View* button_view) { 276 void WebUILoginView::ButtonVisibilityChanged(views::View* button_view) {
281 if (status_area_) 277 if (status_area_)
282 status_area_->UpdateButtonVisibility(); 278 status_area_->UpdateButtonVisibility();
283 } 279 }
284 280
285 void WebUILoginView::OnRenderHostCreated(RenderViewHost* host) { 281 void WebUILoginView::OnRenderHostCreated(RenderViewHost* host) {
286 new SnifferObserver(host, GetWebUI()); 282 new SnifferObserver(host, GetWebUI());
287 } 283 }
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
423 // when the focus is inside an iframe. Only clear on KeyDown to prevent hiding 419 // when the focus is inside an iframe. Only clear on KeyDown to prevent hiding
424 // an immediate authentication error (See crbug.com/103643). 420 // an immediate authentication error (See crbug.com/103643).
425 if (event.type == WebKit::WebInputEvent::KeyDown) { 421 if (event.type == WebKit::WebInputEvent::KeyDown) {
426 content::WebUI* web_ui = GetWebUI(); 422 content::WebUI* web_ui = GetWebUI();
427 if (web_ui) 423 if (web_ui)
428 web_ui->CallJavascriptFunction("cr.ui.Oobe.clearErrors"); 424 web_ui->CallJavascriptFunction("cr.ui.Oobe.clearErrors");
429 } 425 }
430 } 426 }
431 427
432 } // namespace chromeos 428 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/webui_login_view.h ('k') | chrome/browser/chromeos/status/status_area_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698