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

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

Issue 23904025: Move IsRunningOnChromeOS to SysInfo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge fix Created 7 years, 2 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"
9 #include "base/command_line.h" 8 #include "base/command_line.h"
10 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
11 #include "base/logging.h" 10 #include "base/logging.h"
12 #include "base/memory/singleton.h" 11 #include "base/memory/singleton.h"
13 #include "base/path_service.h" 12 #include "base/path_service.h"
14 #include "base/synchronization/waitable_event.h" 13 #include "base/synchronization/waitable_event.h"
14 #include "base/sys_info.h"
15 #include "base/threading/thread_restrictions.h" 15 #include "base/threading/thread_restrictions.h"
16 #include "base/time/time.h" 16 #include "base/time/time.h"
17 #include "chromeos/app_mode/kiosk_oem_manifest_parser.h" 17 #include "chromeos/app_mode/kiosk_oem_manifest_parser.h"
18 #include "chromeos/chromeos_constants.h" 18 #include "chromeos/chromeos_constants.h"
19 #include "chromeos/chromeos_switches.h" 19 #include "chromeos/chromeos_switches.h"
20 #include "chromeos/system/name_value_pairs_parser.h" 20 #include "chromeos/system/name_value_pairs_parser.h"
21 #include "content/public/browser/browser_thread.h" 21 #include "content/public/browser/browser_thread.h"
22 22
23 using content::BrowserThread; 23 using content::BrowserThread;
24 24
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 private: 288 private:
289 friend struct DefaultSingletonTraits<StatisticsProviderStubImpl>; 289 friend struct DefaultSingletonTraits<StatisticsProviderStubImpl>;
290 290
291 StatisticsProviderStubImpl() { 291 StatisticsProviderStubImpl() {
292 } 292 }
293 293
294 DISALLOW_COPY_AND_ASSIGN(StatisticsProviderStubImpl); 294 DISALLOW_COPY_AND_ASSIGN(StatisticsProviderStubImpl);
295 }; 295 };
296 296
297 StatisticsProvider* StatisticsProvider::GetInstance() { 297 StatisticsProvider* StatisticsProvider::GetInstance() {
298 if (base::chromeos::IsRunningOnChromeOS()) { 298 if (base::SysInfo::IsRunningOnChromeOS()) {
299 return StatisticsProviderImpl::GetInstance(); 299 return StatisticsProviderImpl::GetInstance();
300 } else { 300 } else {
301 return StatisticsProviderStubImpl::GetInstance(); 301 return StatisticsProviderStubImpl::GetInstance();
302 } 302 }
303 } 303 }
304 304
305 } // namespace system 305 } // namespace system
306 } // namespace chromeos 306 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/system/input_device_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