Index: chrome/browser/memory/tab_manager_delegate_chromeos.h |
diff --git a/chrome/browser/memory/tab_manager_delegate_chromeos.h b/chrome/browser/memory/tab_manager_delegate_chromeos.h |
index 3722980f7c7d0ee85a1c2ac20cf506401fdd008f..b50a575be801a8b7adce497562ea868cc399eaeb 100644 |
--- a/chrome/browser/memory/tab_manager_delegate_chromeos.h |
+++ b/chrome/browser/memory/tab_manager_delegate_chromeos.h |
@@ -75,7 +75,8 @@ enum ProcessPriority { |
// Note that AdjustOomPriorities will be called on the UI thread by |
// TabManager, but the actual work will take place on the file thread |
// (see implementation of AdjustOomPriorities). |
-class TabManagerDelegate : public arc::ArcBridgeService::Observer, |
+class TabManagerDelegate : public arc::ArcBridgeService::InstanceObserver< |
+ arc::mojom::ProcessInstance>, |
public aura::client::ActivationChangeObserver, |
public content::NotificationObserver, |
public chrome::BrowserListObserver { |
@@ -91,9 +92,10 @@ class TabManagerDelegate : public arc::ArcBridgeService::Observer, |
void OnBrowserSetLastActive(Browser* browser) override; |
- // ArcBridgeService::Observer overrides. |
- void OnProcessInstanceReady() override; |
- void OnProcessInstanceClosed() override; |
+ // ArcBridgeService::InstanceObserver<arc::mojom::ProcessInstance> overrides. |
+ void OnInstanceReady(arc::mojom::ProcessInstance* process_instance, |
+ uint32_t version) override; |
+ void OnInstanceClosed(arc::mojom::ProcessInstance*) override; |
// aura::ActivationChangeObserver overrides. |
void OnWindowActivated( |
@@ -136,8 +138,8 @@ class TabManagerDelegate : public arc::ArcBridgeService::Observer, |
class FocusedProcess; |
class UmaReporter; |
- friend std::ostream& operator<<( |
- std::ostream& out, const Candidate& candidate); |
+ friend std::ostream& operator<<(std::ostream& out, |
+ const Candidate& candidate); |
// content::NotificationObserver: |
void Observe(int type, |
@@ -148,7 +150,7 @@ class TabManagerDelegate : public arc::ArcBridgeService::Observer, |
typedef std::pair<int, base::ProcessHandle> ProcessInfo; |
// Cache OOM scores in memory. |
- typedef base::hash_map<base::ProcessHandle, int> ProcessScoreMap; |
+ typedef base::hash_map<base::ProcessHandle, int> ProcessScoreMap; // NOLINT |
hidehiko
2016/07/11 05:24:53
Clarification: For what ... ? > NOLINT.
Luis Héctor Chávez
2016/07/11 17:13:33
`git cl lint` flags this as std::hash_map. I'll tr
Luis Héctor Chávez
2016/07/11 20:10:44
Filed crbug.com/627202. I have a fix ready and wil
|
// Get the list of candidates to kill, sorted by reversed importance. |
static std::vector<Candidate> GetSortedCandidates( |
@@ -243,9 +245,7 @@ struct TabManagerDelegate::Candidate { |
Candidate(const arc::ArcProcess* _app, int _priority) |
: app(_app), priority(_priority), is_arc_app(true) {} |
- bool operator<(const Candidate& rhs) const { |
- return priority < rhs.priority; |
- } |
+ bool operator<(const Candidate& rhs) const { return priority < rhs.priority; } |
union { |
const TabStats* tab; |