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

Side by Side Diff: chrome/browser/chromeos/dbus/cros_disks_client.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/dbus/cros_disks_client.h" 5 #include "chrome/browser/chromeos/dbus/cros_disks_client.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/chromeos/chromeos_version.h"
8 #include "base/stl_util.h" 9 #include "base/stl_util.h"
9 #include "chrome/browser/chromeos/system/runtime_environment.h"
10 #include "dbus/bus.h" 10 #include "dbus/bus.h"
11 #include "dbus/message.h" 11 #include "dbus/message.h"
12 #include "dbus/object_path.h" 12 #include "dbus/object_path.h"
13 #include "dbus/object_proxy.h" 13 #include "dbus/object_proxy.h"
14 #include "third_party/cros_system_api/dbus/service_constants.h" 14 #include "third_party/cros_system_api/dbus/service_constants.h"
15 15
16 namespace chromeos { 16 namespace chromeos {
17 17
18 namespace { 18 namespace {
19 19
(...skipping 530 matching lines...) Expand 10 before | Expand all | Expand 10 after
550 550
551 //////////////////////////////////////////////////////////////////////////////// 551 ////////////////////////////////////////////////////////////////////////////////
552 // CrosDisksClient 552 // CrosDisksClient
553 553
554 CrosDisksClient::CrosDisksClient() {} 554 CrosDisksClient::CrosDisksClient() {}
555 555
556 CrosDisksClient::~CrosDisksClient() {} 556 CrosDisksClient::~CrosDisksClient() {}
557 557
558 // static 558 // static
559 CrosDisksClient* CrosDisksClient::Create(dbus::Bus* bus) { 559 CrosDisksClient* CrosDisksClient::Create(dbus::Bus* bus) {
560 if (system::runtime_environment::IsRunningOnChromeOS()) 560 if (base::chromeos::IsRunningOnChromeOS())
561 return new CrosDisksClientImpl(bus); 561 return new CrosDisksClientImpl(bus);
562 else 562 else
563 return new CrosDisksClientStubImpl(); 563 return new CrosDisksClientStubImpl();
564 } 564 }
565 565
566 } // namespace chromeos 566 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/dbus/cros_dbus_service.cc ('k') | chrome/browser/chromeos/dbus/cryptohome_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698