diff options
| author | tiago.vignatti@intel.com <tiago.vignatti@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-19 19:58:01 +0000 |
|---|---|---|
| committer | tiago.vignatti@intel.com <tiago.vignatti@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-19 19:58:01 +0000 |
| commit | 27cde4ae372b44f0629795e17fff890c33bbe66a (patch) | |
| tree | 2d8110fa54ebe9493343660a9496d871581fabb9 | |
| parent | 1b0b862d42fb7b99040c0d2e55e234ca8732f3b4 (diff) | |
| download | chromium_src-27cde4ae372b44f0629795e17fff890c33bbe66a.zip chromium_src-27cde4ae372b44f0629795e17fff890c33bbe66a.tar.gz chromium_src-27cde4ae372b44f0629795e17fff890c33bbe66a.tar.bz2 | |
ash: Wrap ChOS code correctly
ChromeOS is the only platform that requires access to GEM memory and that code should be wrapped by its macros.
BUG=none
Review URL: https://chromiumcodereview.appspot.com/23534066
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224191 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ash/display/display_controller.cc | 2 | ||||
| -rw-r--r-- | ash/system/monitor/tray_monitor.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/ash/display/display_controller.cc b/ash/display/display_controller.cc index 8dde730..3ab258b 100644 --- a/ash/display/display_controller.cc +++ b/ash/display/display_controller.cc @@ -221,8 +221,8 @@ DisplayController::DisplayController() : primary_root_window_for_replace_(NULL), focus_activation_store_(new internal::FocusActivationStore()), mirror_window_controller_(new internal::MirrorWindowController) { - CommandLine* command_line = CommandLine::ForCurrentProcess(); #if defined(OS_CHROMEOS) + CommandLine* command_line = CommandLine::ForCurrentProcess(); if (!command_line->HasSwitch(switches::kAshDisableDisplayChangeLimiter) && base::chromeos::IsRunningOnChromeOS()) limiter_.reset(new DisplayChangeLimiter); diff --git a/ash/system/monitor/tray_monitor.cc b/ash/system/monitor/tray_monitor.cc index eb9a4db..bc3d532 100644 --- a/ash/system/monitor/tray_monitor.cc +++ b/ash/system/monitor/tray_monitor.cc @@ -66,12 +66,14 @@ void TrayMonitor::OnGotHandles(const std::list<base::ProcessHandle>& handles) { base::string16 free_bytes = ui::FormatBytes(static_cast<int64>(mem_info.free) * 1024); output = base::StringPrintf("free: %s", UTF16ToUTF8(free_bytes).c_str()); +#if defined(OS_CHROMEOS) if (mem_info.gem_size != -1) { base::string16 gem_size = ui::FormatBytes(mem_info.gem_size); output += base::StringPrintf(" gmem: %s", UTF16ToUTF8(gem_size).c_str()); if (mem_info.gem_objects != -1) output += base::StringPrintf(" gobjects: %d", mem_info.gem_objects); } +#endif size_t total_private_bytes = 0, total_shared_bytes = 0; for (std::list<base::ProcessHandle>::const_iterator i = handles.begin(); i != handles.end(); ++i) { |