| OLD | NEW |
| 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 "chrome/browser/ui/browser_tab_restore_service_delegate.h" | 5 #include "chrome/browser/ui/browser_tab_restore_service_delegate.h" |
| 6 | 6 |
| 7 #include "chrome/browser/ui/browser.h" | 7 #include "chrome/browser/ui/browser.h" |
| 8 #include "chrome/browser/ui/browser_list.h" | 8 #include "chrome/browser/ui/browser_finder.h" |
| 9 #include "chrome/browser/ui/browser_window.h" | 9 #include "chrome/browser/ui/browser_window.h" |
| 10 #include "content/public/browser/navigation_controller.h" | 10 #include "content/public/browser/navigation_controller.h" |
| 11 | 11 |
| 12 using content::NavigationController; | 12 using content::NavigationController; |
| 13 using content::SessionStorageNamespace; | 13 using content::SessionStorageNamespace; |
| 14 using content::WebContents; | 14 using content::WebContents; |
| 15 | 15 |
| 16 void BrowserTabRestoreServiceDelegate::ShowBrowserWindow() { | 16 void BrowserTabRestoreServiceDelegate::ShowBrowserWindow() { |
| 17 browser_->window()->Show(); | 17 browser_->window()->Show(); |
| 18 } | 18 } |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 92 if (browser) | 92 if (browser) |
| 93 return browser->tab_restore_service_delegate(); | 93 return browser->tab_restore_service_delegate(); |
| 94 else | 94 else |
| 95 return NULL; | 95 return NULL; |
| 96 } | 96 } |
| 97 | 97 |
| 98 // static | 98 // static |
| 99 TabRestoreServiceDelegate* TabRestoreServiceDelegate::FindDelegateForController( | 99 TabRestoreServiceDelegate* TabRestoreServiceDelegate::FindDelegateForController( |
| 100 const NavigationController* controller, | 100 const NavigationController* controller, |
| 101 int* index) { | 101 int* index) { |
| 102 Browser* browser = Browser::GetBrowserForController(controller, index); | 102 Browser* browser = browser::FindBrowserForController(controller, index); |
| 103 if (browser) | 103 if (browser) |
| 104 return browser->tab_restore_service_delegate(); | 104 return browser->tab_restore_service_delegate(); |
| 105 else | 105 else |
| 106 return NULL; | 106 return NULL; |
| 107 } | 107 } |
| 108 | 108 |
| 109 // static | 109 // static |
| 110 TabRestoreServiceDelegate* TabRestoreServiceDelegate::FindDelegateWithID( | 110 TabRestoreServiceDelegate* TabRestoreServiceDelegate::FindDelegateWithID( |
| 111 SessionID::id_type desired_id) { | 111 SessionID::id_type desired_id) { |
| 112 Browser* browser = BrowserList::FindBrowserWithID(desired_id); | 112 Browser* browser = browser::FindBrowserWithID(desired_id); |
| 113 if (browser) | 113 if (browser) |
| 114 return browser->tab_restore_service_delegate(); | 114 return browser->tab_restore_service_delegate(); |
| 115 else | 115 else |
| 116 return NULL; | 116 return NULL; |
| 117 } | 117 } |
| OLD | NEW |