diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-08-19 13:00:08 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-08-19 13:00:08 +0100 |
| commit | 6e8cce623b6e4fe0c9e4af605d675dd9d0338c38 (patch) | |
| tree | 8d824ad26fac42e008142b86aa9631b2be7e4705 /content/common/gpu/gpu_memory_manager.cc | |
| parent | 4f7316adb45db5ec3c9c1181ba9510c004566df8 (diff) | |
| download | chromium_org-6e8cce623b6e4fe0c9e4af605d675dd9d0338c38.tar.gz | |
Merge from Chromium at DEPS revision 290040
This commit was generated by merge_to_master.py.
Change-Id: I694ec52d1e0b553f163c2faf4373d63270ab1aac
Diffstat (limited to 'content/common/gpu/gpu_memory_manager.cc')
| -rw-r--r-- | content/common/gpu/gpu_memory_manager.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/common/gpu/gpu_memory_manager.cc b/content/common/gpu/gpu_memory_manager.cc index 9a233758f0..045210aa89 100644 --- a/content/common/gpu/gpu_memory_manager.cc +++ b/content/common/gpu/gpu_memory_manager.cc @@ -62,11 +62,11 @@ GpuMemoryManager::~GpuMemoryManager() { void GpuMemoryManager::UpdateAvailableGpuMemory() { // If the value was overridden on the command line, use the specified value. static bool client_hard_limit_bytes_overridden = - CommandLine::ForCurrentProcess()->HasSwitch( + base::CommandLine::ForCurrentProcess()->HasSwitch( switches::kForceGpuMemAvailableMb); if (client_hard_limit_bytes_overridden) { base::StringToUint64( - CommandLine::ForCurrentProcess()->GetSwitchValueASCII( + base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( switches::kForceGpuMemAvailableMb), &client_hard_limit_bytes_); client_hard_limit_bytes_ *= 1024 * 1024; |