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

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

Issue 2053001: Fix crash when opening "Select certificate file" in OOBE. (Closed) Base URL: git://codf21.jail/chromium.git
Patch Set: added correct way to check for OOBE/login mode Created 10 years, 7 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 (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/background_view.h" 5 #include "chrome/browser/chromeos/login/background_view.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "app/resource_bundle.h" 8 #include "app/resource_bundle.h"
9 #include "app/x11_util.h" 9 #include "app/x11_util.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 } 134 }
135 135
136 void BackgroundView::OpenButtonOptions(const views::View* button_view) const { 136 void BackgroundView::OpenButtonOptions(const views::View* button_view) const {
137 // TODO(avayvod): Add some dialog for options or remove them completely. 137 // TODO(avayvod): Add some dialog for options or remove them completely.
138 } 138 }
139 139
140 bool BackgroundView::IsButtonVisible(const views::View* button_view) const { 140 bool BackgroundView::IsButtonVisible(const views::View* button_view) const {
141 return true; 141 return true;
142 } 142 }
143 143
144 bool BackgroundView::IsBrowserMode() const {
145 return false;
146 }
147
144 void BackgroundView::LocaleChanged() { 148 void BackgroundView::LocaleChanged() {
145 Layout(); 149 Layout();
146 SchedulePaint(); 150 SchedulePaint();
147 } 151 }
148 152
149 void BackgroundView::InitStatusArea() { 153 void BackgroundView::InitStatusArea() {
150 DCHECK(status_area_ == NULL); 154 DCHECK(status_area_ == NULL);
151 status_area_ = new StatusAreaView(this); 155 status_area_ = new StatusAreaView(this);
152 status_area_->Init(); 156 status_area_->Init();
153 AddChildView(status_area_); 157 AddChildView(status_area_);
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 kBootTimesNoChromeExec, 228 kBootTimesNoChromeExec,
225 boot_times.firmware + boot_times.login_prompt_ready, 229 boot_times.firmware + boot_times.login_prompt_ready,
226 boot_times.firmware, 230 boot_times.firmware,
227 boot_times.pre_startup, 231 boot_times.pre_startup,
228 boot_times.login_prompt_ready - boot_times.pre_startup); 232 boot_times.login_prompt_ready - boot_times.pre_startup);
229 } 233 }
230 boot_times_label_->SetText(ASCIIToWide(boot_times_text)); 234 boot_times_label_->SetText(ASCIIToWide(boot_times_text));
231 } 235 }
232 236
233 } // namespace chromeos 237 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/background_view.h ('k') | chrome/browser/chromeos/login/network_screen.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698