| Index: chrome/browser/chromeos/memory/oom_priority_manager.h
|
| diff --git a/chrome/browser/chromeos/memory/oom_priority_manager.h b/chrome/browser/chromeos/memory/oom_priority_manager.h
|
| index 4fea9ed159f9427e4699e2305d21b452dd8d24cc..3df538ebddccb3b144de5fe257e24bc50e6f3677 100644
|
| --- a/chrome/browser/chromeos/memory/oom_priority_manager.h
|
| +++ b/chrome/browser/chromeos/memory/oom_priority_manager.h
|
| @@ -52,7 +52,7 @@ class OomPriorityManager : public content::NotificationObserver,
|
|
|
| // Returns list of tab titles sorted from most interesting (don't kill)
|
| // to least interesting (OK to kill).
|
| - std::vector<string16> GetTabTitles();
|
| + std::vector<base::string16> GetTabTitles();
|
|
|
| // Discards a tab to free the memory occupied by its renderer.
|
| // Tab still exists in the tab-strip; clicking on it will reload it.
|
| @@ -80,7 +80,7 @@ class OomPriorityManager : public content::NotificationObserver,
|
| bool is_discarded;
|
| base::TimeTicks last_selected;
|
| base::ProcessHandle renderer_handle;
|
| - string16 title;
|
| + base::string16 title;
|
| int64 tab_contents_id; // unique ID per WebContents
|
| };
|
| typedef std::vector<TabStats> TabStatsList;
|
|
|