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

Unified Diff: ash/shell.cc

Issue 23904025: Move IsRunningOnChromeOS to SysInfo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge fix Created 7 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/display/display_manager.cc ('k') | ash/wm/lock_state_controller_impl2.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 8e91497fad7c6012f665efdc964c0c8391abe039..123b81efc16775c38459eb6feb1f11ada4908637 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -113,8 +113,8 @@
#include "ash/display/display_change_observer_chromeos.h"
#include "ash/display/display_error_observer_chromeos.h"
#include "ash/display/output_configurator_animation.h"
-#include "base/chromeos/chromeos_version.h"
#include "base/message_loop/message_pump_x11.h"
+#include "base/sys_info.h"
#include "chromeos/display/output_configurator.h"
#include "content/public/browser/gpu_data_manager.h"
#include "gpu/config/gpu_feature_type.h"
@@ -407,7 +407,7 @@ void Shell::Init() {
output_configurator_animation_.reset(
new internal::OutputConfiguratorAnimation());
output_configurator_->AddObserver(output_configurator_animation_.get());
- if (base::chromeos::IsRunningOnChromeOS()) {
+ if (base::SysInfo::IsRunningOnChromeOS()) {
display_change_observer_.reset(new internal::DisplayChangeObserver);
// Register |display_change_observer_| first so that the rest of
// observer gets invoked after the root windows are configured.
« no previous file with comments | « ash/display/display_manager.cc ('k') | ash/wm/lock_state_controller_impl2.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698