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

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

Issue 6378008: Add GetScreenMode() to status_area_host.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review fix Created 9 years, 11 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/background_view.h" 5 #include "chrome/browser/chromeos/login/background_view.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "app/l10n_util.h" 10 #include "app/l10n_util.h"
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 void BackgroundView::OpenButtonOptions(const views::View* button_view) { 320 void BackgroundView::OpenButtonOptions(const views::View* button_view) {
321 if (button_view == status_area_->network_view()) { 321 if (button_view == status_area_->network_view()) {
322 if (proxy_settings_dialog_.get() == NULL) { 322 if (proxy_settings_dialog_.get() == NULL) {
323 proxy_settings_dialog_.reset(new ProxySettingsDialog( 323 proxy_settings_dialog_.reset(new ProxySettingsDialog(
324 this, GetNativeWindow())); 324 this, GetNativeWindow()));
325 } 325 }
326 proxy_settings_dialog_->Show(); 326 proxy_settings_dialog_->Show();
327 } 327 }
328 } 328 }
329 329
330 bool BackgroundView::IsBrowserMode() const { 330 StatusAreaHost::ScreenMode BackgroundView::GetScreenMode() const {
331 return false; 331 return kLoginMode;
332 }
333
334 bool BackgroundView::IsScreenLockerMode() const {
335 return false;
336 } 332 }
337 333
338 // Overridden from LoginHtmlDialog::Delegate: 334 // Overridden from LoginHtmlDialog::Delegate:
339 void BackgroundView::OnLocaleChanged() { 335 void BackgroundView::OnLocaleChanged() {
340 // Proxy settings dialog contains localized strings. 336 // Proxy settings dialog contains localized strings.
341 proxy_settings_dialog_.reset(); 337 proxy_settings_dialog_.reset();
342 } 338 }
343 339
344 /////////////////////////////////////////////////////////////////////////////// 340 ///////////////////////////////////////////////////////////////////////////////
345 // BackgroundView private: 341 // BackgroundView private:
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
448 kBootTimesNoChromeExec, 444 kBootTimesNoChromeExec,
449 boot_times.total, 445 boot_times.total,
450 boot_times.pre_startup, 446 boot_times.pre_startup,
451 boot_times.system); 447 boot_times.system);
452 } 448 }
453 // Use UTF8ToWide once this string is localized. 449 // Use UTF8ToWide once this string is localized.
454 boot_times_label_->SetText(ASCIIToWide(boot_times_text)); 450 boot_times_label_->SetText(ASCIIToWide(boot_times_text));
455 } 451 }
456 452
457 } // namespace chromeos 453 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/background_view.h ('k') | chrome/browser/chromeos/login/keyboard_switch_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698