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

Side by Side Diff: chrome/browser/chromeos/system/statistics_provider.cc

Issue 9546013: Move IsRunningOnChromeOS to base/chromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chromeos_version,sync,cleanup Created 8 years, 9 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/system/statistics_provider.h" 5 #include "chrome/browser/chromeos/system/statistics_provider.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/chromeos/chromeos_version.h"
8 #include "base/file_path.h" 9 #include "base/file_path.h"
9 #include "base/file_util.h" 10 #include "base/file_util.h"
10 #include "base/logging.h" 11 #include "base/logging.h"
11 #include "base/memory/singleton.h" 12 #include "base/memory/singleton.h"
12 #include "base/synchronization/waitable_event.h" 13 #include "base/synchronization/waitable_event.h"
13 #include "base/time.h" 14 #include "base/time.h"
15 #include "base/chromeos/chromeos_version.h"
14 #include "chrome/browser/chromeos/system/name_value_pairs_parser.h" 16 #include "chrome/browser/chromeos/system/name_value_pairs_parser.h"
15 #include "chrome/browser/chromeos/system/runtime_environment.h"
16 #include "chrome/common/child_process_logging.h" 17 #include "chrome/common/child_process_logging.h"
17 #include "chrome/common/chrome_version_info.h" 18 #include "chrome/common/chrome_version_info.h"
18 #include "content/public/browser/browser_thread.h" 19 #include "content/public/browser/browser_thread.h"
19 20
20 using content::BrowserThread; 21 using content::BrowserThread;
21 22
22 namespace chromeos { 23 namespace chromeos {
23 namespace system { 24 namespace system {
24 namespace { 25 namespace {
25 26
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 private: 203 private:
203 friend struct DefaultSingletonTraits<StatisticsProviderStubImpl>; 204 friend struct DefaultSingletonTraits<StatisticsProviderStubImpl>;
204 205
205 StatisticsProviderStubImpl() { 206 StatisticsProviderStubImpl() {
206 } 207 }
207 208
208 DISALLOW_COPY_AND_ASSIGN(StatisticsProviderStubImpl); 209 DISALLOW_COPY_AND_ASSIGN(StatisticsProviderStubImpl);
209 }; 210 };
210 211
211 StatisticsProvider* StatisticsProvider::GetInstance() { 212 StatisticsProvider* StatisticsProvider::GetInstance() {
212 if (system::runtime_environment::IsRunningOnChromeOS()) { 213 if (base::chromeos::IsRunningOnChromeOS()) {
213 return StatisticsProviderImpl::GetInstance(); 214 return StatisticsProviderImpl::GetInstance();
214 } else { 215 } else {
215 return StatisticsProviderStubImpl::GetInstance(); 216 return StatisticsProviderStubImpl::GetInstance();
216 } 217 }
217 } 218 }
218 219
219 } // namespace system 220 } // namespace system
220 } // namespace chromeos 221 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/system/screen_locker_settings.cc ('k') | chrome/browser/chromeos/system/timezone_settings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698