Index: chrome/browser/memory/tab_manager_delegate_chromeos.cc |
diff --git a/chrome/browser/memory/tab_manager_delegate_chromeos.cc b/chrome/browser/memory/tab_manager_delegate_chromeos.cc |
index 482efe35c44111ba25b9837e121bd96f85e14e03..93453227bb7baf76bc7c10c3ceee620738b929b1 100644 |
--- a/chrome/browser/memory/tab_manager_delegate_chromeos.cc |
+++ b/chrome/browser/memory/tab_manager_delegate_chromeos.cc |
@@ -284,15 +284,14 @@ int TabManagerDelegate::MemoryStat::EstimatedMemoryFreedKB( |
} |
class TabManagerDelegate::UmaReporter { |
- public: |
- UmaReporter() |
- : last_kill_time_(), total_kills_(0) {} |
- ~UmaReporter() {} |
- void ReportKill(const int memory_freed); |
- |
- private: |
- base::Time last_kill_time_; |
- int total_kills_; |
+ public: |
+ UmaReporter() : last_kill_time_(), total_kills_(0) {} |
+ ~UmaReporter() {} |
+ void ReportKill(const int memory_freed); |
+ |
+ private: |
+ base::Time last_kill_time_; |
+ int total_kills_; |
}; |
void TabManagerDelegate::UmaReporter::ReportKill(const int memory_freed) { |
@@ -336,7 +335,7 @@ TabManagerDelegate::TabManagerDelegate( |
content::NotificationService::AllBrowserContextsAndSources()); |
auto arc_bridge_service = arc::ArcBridgeService::Get(); |
if (arc_bridge_service) |
- arc_bridge_service->AddObserver(this); |
+ arc_bridge_service->process()->AddObserver(this); |
auto activation_client = GetActivationClient(); |
if (activation_client) |
activation_client->AddObserver(this); |
@@ -350,7 +349,7 @@ TabManagerDelegate::~TabManagerDelegate() { |
activation_client->RemoveObserver(this); |
auto arc_bridge_service = arc::ArcBridgeService::Get(); |
if (arc_bridge_service) |
- arc_bridge_service->RemoveObserver(this); |
+ arc_bridge_service->process()->RemoveObserver(this); |
} |
void TabManagerDelegate::OnBrowserSetLastActive(Browser* browser) { |
@@ -369,12 +368,12 @@ void TabManagerDelegate::OnBrowserSetLastActive(Browser* browser) { |
AdjustFocusedTabScore(pid); |
} |
-void TabManagerDelegate::OnProcessInstanceReady() { |
+void TabManagerDelegate::OnInstanceReady() { |
auto arc_bridge_service = arc::ArcBridgeService::Get(); |
DCHECK(arc_bridge_service); |
- arc_process_instance_ = arc_bridge_service->process_instance(); |
- arc_process_instance_version_ = arc_bridge_service->process_version(); |
+ arc_process_instance_ = arc_bridge_service->process()->instance(); |
+ arc_process_instance_version_ = arc_bridge_service->process()->version(); |
DCHECK(arc_process_instance_); |
@@ -399,7 +398,7 @@ void TabManagerDelegate::OnProcessInstanceReady() { |
arc_process_instance_->DisableLowMemoryKiller(); |
} |
-void TabManagerDelegate::OnProcessInstanceClosed() { |
+void TabManagerDelegate::OnInstanceClosed() { |
arc_process_instance_ = nullptr; |
arc_process_instance_version_ = 0; |
} |