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

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

Issue 10096012: [cros] Add Ctrl+Alt+E shortcut to Welcome/EULA screen that cancels update and starts with enrollment (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 8 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
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/update_screen.h" 5 #include "chrome/browser/chromeos/login/update_screen.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/threading/thread_restrictions.h" 10 #include "base/threading/thread_restrictions.h"
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 VLOG(1) << "Initiate update check"; 188 VLOG(1) << "Initiate update check";
189 DBusThreadManager::Get()->GetUpdateEngineClient()->RequestUpdateCheck( 189 DBusThreadManager::Get()->GetUpdateEngineClient()->RequestUpdateCheck(
190 base::Bind(StartUpdateCallback, this)); 190 base::Bind(StartUpdateCallback, this));
191 } 191 }
192 192
193 void UpdateScreen::CancelUpdate() { 193 void UpdateScreen::CancelUpdate() {
194 VLOG(1) << "Forced update cancel"; 194 VLOG(1) << "Forced update cancel";
195 ExitUpdate(REASON_UPDATE_CANCELED); 195 ExitUpdate(REASON_UPDATE_CANCELED);
196 } 196 }
197 197
198 void UpdateScreen::SkipUpdateEnrollAfterEula() {
199 get_screen_observer()->SkipUpdateEnrollAfterEula();
200 }
201
198 void UpdateScreen::Show() { 202 void UpdateScreen::Show() {
199 is_shown_ = true; 203 is_shown_ = true;
200 actor_->Show(); 204 actor_->Show();
201 actor_->SetProgress(kBeforeUpdateCheckProgress); 205 actor_->SetProgress(kBeforeUpdateCheckProgress);
202 } 206 }
203 207
204 void UpdateScreen::Hide() { 208 void UpdateScreen::Hide() {
205 actor_->Hide(); 209 actor_->Hide();
206 is_shown_ = false; 210 is_shown_ = false;
207 } 211 }
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 // if the file exists and not empty, there is critical update. 298 // if the file exists and not empty, there is critical update.
295 return true; 299 return true;
296 } 300 }
297 301
298 void UpdateScreen::OnActorDestroyed(UpdateScreenActor* actor) { 302 void UpdateScreen::OnActorDestroyed(UpdateScreenActor* actor) {
299 if (actor_ == actor) 303 if (actor_ == actor)
300 actor_ = NULL; 304 actor_ = NULL;
301 } 305 }
302 306
303 } // namespace chromeos 307 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698