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

Side by Side Diff: chrome/browser/chromeos/dbus/session_manager_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/session_manager_client.h" 5 #include "chrome/browser/chromeos/dbus/session_manager_client.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/chromeos/chromeos_version.h"
9 #include "base/string_util.h" 10 #include "base/string_util.h"
10 #include "chrome/browser/chromeos/system/runtime_environment.h"
11 #include "dbus/bus.h" 11 #include "dbus/bus.h"
12 #include "dbus/message.h" 12 #include "dbus/message.h"
13 #include "dbus/object_path.h" 13 #include "dbus/object_path.h"
14 #include "dbus/object_proxy.h" 14 #include "dbus/object_proxy.h"
15 #include "third_party/cros_system_api/dbus/service_constants.h" 15 #include "third_party/cros_system_api/dbus/service_constants.h"
16 16
17 namespace chromeos { 17 namespace chromeos {
18 18
19 // The SessionManagerClient implementation used in production. 19 // The SessionManagerClient implementation used in production.
20 class SessionManagerClientImpl : public SessionManagerClient { 20 class SessionManagerClientImpl : public SessionManagerClient {
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 304
305 }; 305 };
306 306
307 SessionManagerClient::SessionManagerClient() { 307 SessionManagerClient::SessionManagerClient() {
308 } 308 }
309 309
310 SessionManagerClient::~SessionManagerClient() { 310 SessionManagerClient::~SessionManagerClient() {
311 } 311 }
312 312
313 SessionManagerClient* SessionManagerClient::Create(dbus::Bus* bus) { 313 SessionManagerClient* SessionManagerClient::Create(dbus::Bus* bus) {
314 if (system::runtime_environment::IsRunningOnChromeOS()) { 314 if (base::chromeos::IsRunningOnChromeOS()) {
315 return new SessionManagerClientImpl(bus); 315 return new SessionManagerClientImpl(bus);
316 } else { 316 } else {
317 return new SessionManagerClientStubImpl(); 317 return new SessionManagerClientStubImpl();
318 } 318 }
319 } 319 }
320 320
321 } // namespace chromeos 321 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/dbus/sensors_client.cc ('k') | chrome/browser/chromeos/dbus/speech_synthesizer_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698