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

Side by Side Diff: chrome/browser/upgrade_detector_impl.cc

Issue 557833006: Fix WeakPtrFactory member ordering in chrome/browser and chrome/service (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed the WeakPtr comments in files Created 6 years, 3 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) 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/upgrade_detector_impl.h" 5 #include "chrome/browser/upgrade_detector_impl.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/build_time.h" 10 #include "base/build_time.h"
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 } 180 }
181 181
182 installed_version = Version(reply); 182 installed_version = Version(reply);
183 #endif 183 #endif
184 return installed_version; 184 return installed_version;
185 } 185 }
186 186
187 } // namespace 187 } // namespace
188 188
189 UpgradeDetectorImpl::UpgradeDetectorImpl() 189 UpgradeDetectorImpl::UpgradeDetectorImpl()
190 : weak_factory_(this), 190 : is_unstable_channel_(false),
191 is_unstable_channel_(false),
192 is_auto_update_enabled_(true), 191 is_auto_update_enabled_(true),
193 build_date_(base::GetBuildTime()) { 192 build_date_(base::GetBuildTime()),
193 weak_factory_(this) {
194 CommandLine command_line(*CommandLine::ForCurrentProcess()); 194 CommandLine command_line(*CommandLine::ForCurrentProcess());
195 // The different command line switches that affect testing can't be used 195 // The different command line switches that affect testing can't be used
196 // simultaneously, if they do, here's the precedence order, based on the order 196 // simultaneously, if they do, here's the precedence order, based on the order
197 // of the if statements below: 197 // of the if statements below:
198 // - kDisableBackgroundNetworking prevents any of the other command line 198 // - kDisableBackgroundNetworking prevents any of the other command line
199 // switch from being taken into account. 199 // switch from being taken into account.
200 // - kSimulateUpgrade supersedes critical or outdated upgrade switches. 200 // - kSimulateUpgrade supersedes critical or outdated upgrade switches.
201 // - kSimulateCriticalUpdate has precedence over kSimulateOutdated. 201 // - kSimulateCriticalUpdate has precedence over kSimulateOutdated.
202 // - kSimulateOutdatedNoAU has precedence over kSimulateOutdated. 202 // - kSimulateOutdatedNoAU has precedence over kSimulateOutdated.
203 // - kSimulateOutdated[NoAu] can work on its own, or with a specified date. 203 // - kSimulateOutdated[NoAu] can work on its own, or with a specified date.
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 512
513 // static 513 // static
514 UpgradeDetectorImpl* UpgradeDetectorImpl::GetInstance() { 514 UpgradeDetectorImpl* UpgradeDetectorImpl::GetInstance() {
515 return Singleton<UpgradeDetectorImpl>::get(); 515 return Singleton<UpgradeDetectorImpl>::get();
516 } 516 }
517 517
518 // static 518 // static
519 UpgradeDetector* UpgradeDetector::GetInstance() { 519 UpgradeDetector* UpgradeDetector::GetInstance() {
520 return UpgradeDetectorImpl::GetInstance(); 520 return UpgradeDetectorImpl::GetInstance();
521 } 521 }
OLDNEW
« no previous file with comments | « chrome/browser/upgrade_detector_impl.h ('k') | chrome/service/cloud_print/printer_job_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698