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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
« no previous file with comments | « chrome/browser/upgrade_detector.cc ('k') | chrome/browser/web_applications/web_app.cc » ('j') | 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) 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 <stdint.h> 7 #include <stdint.h>
8 8
9 #include <string> 9 #include <string>
10 10
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/build_time.h" 12 #include "base/build_time.h"
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "base/files/file_path.h" 14 #include "base/files/file_path.h"
15 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
16 #include "base/memory/singleton.h" 16 #include "base/memory/singleton.h"
17 #include "base/path_service.h" 17 #include "base/path_service.h"
18 #include "base/prefs/pref_service.h"
19 #include "base/process/launch.h" 18 #include "base/process/launch.h"
20 #include "base/strings/string_number_conversions.h" 19 #include "base/strings/string_number_conversions.h"
21 #include "base/strings/string_util.h" 20 #include "base/strings/string_util.h"
22 #include "base/strings/utf_string_conversions.h" 21 #include "base/strings/utf_string_conversions.h"
23 #include "base/time/time.h" 22 #include "base/time/time.h"
24 #include "build/build_config.h" 23 #include "build/build_config.h"
25 #include "chrome/browser/browser_process.h" 24 #include "chrome/browser/browser_process.h"
26 #include "chrome/browser/google/google_brand.h" 25 #include "chrome/browser/google/google_brand.h"
27 #include "chrome/common/channel_info.h" 26 #include "chrome/common/channel_info.h"
28 #include "chrome/common/chrome_switches.h" 27 #include "chrome/common/chrome_switches.h"
29 #include "chrome/common/pref_names.h" 28 #include "chrome/common/pref_names.h"
30 #include "components/network_time/network_time_tracker.h" 29 #include "components/network_time/network_time_tracker.h"
30 #include "components/prefs/pref_service.h"
31 #include "components/version_info/version_info.h" 31 #include "components/version_info/version_info.h"
32 #include "content/public/browser/browser_thread.h" 32 #include "content/public/browser/browser_thread.h"
33 33
34 #if defined(OS_WIN) 34 #if defined(OS_WIN)
35 #include "base/win/win_util.h" 35 #include "base/win/win_util.h"
36 #include "chrome/installer/util/browser_distribution.h" 36 #include "chrome/installer/util/browser_distribution.h"
37 #include "chrome/installer/util/google_update_settings.h" 37 #include "chrome/installer/util/google_update_settings.h"
38 #include "chrome/installer/util/helper.h" 38 #include "chrome/installer/util/helper.h"
39 #include "chrome/installer/util/install_util.h" 39 #include "chrome/installer/util/install_util.h"
40 #elif defined(OS_MACOSX) 40 #elif defined(OS_MACOSX)
(...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after
514 514
515 // static 515 // static
516 UpgradeDetectorImpl* UpgradeDetectorImpl::GetInstance() { 516 UpgradeDetectorImpl* UpgradeDetectorImpl::GetInstance() {
517 return base::Singleton<UpgradeDetectorImpl>::get(); 517 return base::Singleton<UpgradeDetectorImpl>::get();
518 } 518 }
519 519
520 // static 520 // static
521 UpgradeDetector* UpgradeDetector::GetInstance() { 521 UpgradeDetector* UpgradeDetector::GetInstance() {
522 return UpgradeDetectorImpl::GetInstance(); 522 return UpgradeDetectorImpl::GetInstance();
523 } 523 }
OLDNEW
« no previous file with comments | « chrome/browser/upgrade_detector.cc ('k') | chrome/browser/web_applications/web_app.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698