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

Side by Side Diff: content/browser/browser_main_loop.cc

Issue 2434353003: Introduce MemoryCoordinatorProxy in base (Closed)
Patch Set: Address on reviews Created 4 years, 1 month 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
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 "content/browser/browser_main_loop.h" 5 #include "content/browser/browser_main_loop.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/bind.h" 13 #include "base/bind.h"
14 #include "base/command_line.h" 14 #include "base/command_line.h"
15 #include "base/feature_list.h" 15 #include "base/feature_list.h"
16 #include "base/location.h" 16 #include "base/location.h"
17 #include "base/logging.h" 17 #include "base/logging.h"
18 #include "base/macros.h" 18 #include "base/macros.h"
19 #include "base/memory/memory_coordinator_proxy.h"
19 #include "base/memory/memory_pressure_monitor.h" 20 #include "base/memory/memory_pressure_monitor.h"
20 #include "base/memory/ptr_util.h" 21 #include "base/memory/ptr_util.h"
21 #include "base/metrics/field_trial.h" 22 #include "base/metrics/field_trial.h"
22 #include "base/metrics/histogram_macros.h" 23 #include "base/metrics/histogram_macros.h"
23 #include "base/metrics/user_metrics.h" 24 #include "base/metrics/user_metrics.h"
24 #include "base/pending_task.h" 25 #include "base/pending_task.h"
25 #include "base/power_monitor/power_monitor.h" 26 #include "base/power_monitor/power_monitor.h"
26 #include "base/power_monitor/power_monitor_device_source.h" 27 #include "base/power_monitor/power_monitor_device_source.h"
27 #include "base/process/process_metrics.h" 28 #include "base/process/process_metrics.h"
28 #include "base/run_loop.h" 29 #include "base/run_loop.h"
(...skipping 1357 matching lines...) Expand 10 before | Expand all | Expand 10 after
1386 1387
1387 bool BrowserMainLoop::UsingInProcessGpu() const { 1388 bool BrowserMainLoop::UsingInProcessGpu() const {
1388 return parsed_command_line_.HasSwitch(switches::kSingleProcess) || 1389 return parsed_command_line_.HasSwitch(switches::kSingleProcess) ||
1389 parsed_command_line_.HasSwitch(switches::kInProcessGPU); 1390 parsed_command_line_.HasSwitch(switches::kInProcessGPU);
1390 } 1391 }
1391 1392
1392 void BrowserMainLoop::InitializeMemoryManagementComponent() { 1393 void BrowserMainLoop::InitializeMemoryManagementComponent() {
1393 if (base::FeatureList::IsEnabled(features::kMemoryCoordinator)) { 1394 if (base::FeatureList::IsEnabled(features::kMemoryCoordinator)) {
1394 // Disable MemoryPressureListener when memory coordinator is enabled. 1395 // Disable MemoryPressureListener when memory coordinator is enabled.
1395 base::MemoryPressureListener::SetNotificationsSuppressed(true); 1396 base::MemoryPressureListener::SetNotificationsSuppressed(true);
1397 // base::Unretained is safe because the lifetime of MemoryCoordinator is
1398 // tied to the lifetime of the browser process.
1399 base::MemoryCoordinatorProxy::GetInstance()->
1400 SetGetCurrentMemoryStateCallback(base::Bind(
1401 &MemoryCoordinator::GetCurrentMemoryState,
1402 base::Unretained(MemoryCoordinator::GetInstance())));
1396 return; 1403 return;
1397 } 1404 }
1398 1405
1399 // TODO(chrisha): Abstract away this construction mess to a helper function, 1406 // TODO(chrisha): Abstract away this construction mess to a helper function,
1400 // once MemoryPressureMonitor is made a concrete class. 1407 // once MemoryPressureMonitor is made a concrete class.
1401 #if defined(OS_CHROMEOS) 1408 #if defined(OS_CHROMEOS)
1402 if (chromeos::switches::MemoryPressureHandlingEnabled()) { 1409 if (chromeos::switches::MemoryPressureHandlingEnabled()) {
1403 memory_pressure_monitor_.reset(new base::chromeos::MemoryPressureMonitor( 1410 memory_pressure_monitor_.reset(new base::chromeos::MemoryPressureMonitor(
1404 chromeos::switches::GetMemoryPressureThresholds())); 1411 chromeos::switches::GetMemoryPressureThresholds()));
1405 } 1412 }
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
1581 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner = 1588 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner =
1582 audio_thread_->task_runner(); 1589 audio_thread_->task_runner();
1583 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner), 1590 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner),
1584 std::move(worker_task_runner), 1591 std::move(worker_task_runner),
1585 MediaInternals::GetInstance()); 1592 MediaInternals::GetInstance());
1586 } 1593 }
1587 CHECK(audio_manager_); 1594 CHECK(audio_manager_);
1588 } 1595 }
1589 1596
1590 } // namespace content 1597 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698