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

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

Issue 6976021: Revert 81536 that made all updates during OOBE required (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/update_screen.h" 5 #include "chrome/browser/chromeos/login/update_screen.h"
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/threading/thread_restrictions.h" 9 #include "base/threading/thread_restrictions.h"
10 #include "chrome/browser/chromeos/cros/cros_library.h" 10 #include "chrome/browser/chromeos/cros/cros_library.h"
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 InstanceSet::iterator found = instance_set.find(inst); 64 InstanceSet::iterator found = instance_set.find(inst);
65 return (found != instance_set.end()); 65 return (found != instance_set.end());
66 } 66 }
67 67
68 68
69 UpdateScreen::UpdateScreen(WizardScreenDelegate* delegate) 69 UpdateScreen::UpdateScreen(WizardScreenDelegate* delegate)
70 : WizardScreen(delegate), 70 : WizardScreen(delegate),
71 reboot_check_delay_(0), 71 reboot_check_delay_(0),
72 is_checking_for_update_(true), 72 is_checking_for_update_(true),
73 is_downloading_update_(false), 73 is_downloading_update_(false),
74 is_ignore_update_deadlines_(true), // See http://crosbug.com/10068 74 is_ignore_update_deadlines_(false),
75 is_shown_(false), 75 is_shown_(false),
76 actor_(new ViewsUpdateScreenActor(delegate, 76 actor_(new ViewsUpdateScreenActor(delegate,
77 kUpdateScreenWidth, 77 kUpdateScreenWidth,
78 kUpdateScreenHeight)) { 78 kUpdateScreenHeight)) {
79 GetInstanceSet().insert(this); 79 GetInstanceSet().insert(this);
80 } 80 }
81 81
82 UpdateScreen::~UpdateScreen() { 82 UpdateScreen::~UpdateScreen() {
83 CrosLibrary::Get()->GetUpdateLibrary()->RemoveObserver(this); 83 CrosLibrary::Get()->GetUpdateLibrary()->RemoveObserver(this);
84 GetInstanceSet().erase(this); 84 GetInstanceSet().erase(this);
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 deadline.empty()) { 270 deadline.empty()) {
271 return false; 271 return false;
272 } 272 }
273 273
274 // TODO(dpolukhin): Analyze file content. Now we can just assume that 274 // TODO(dpolukhin): Analyze file content. Now we can just assume that
275 // if the file exists and not empty, there is critical update. 275 // if the file exists and not empty, there is critical update.
276 return true; 276 return true;
277 } 277 }
278 278
279 } // namespace chromeos 279 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698