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_commands.h" | 8 #include "chrome/browser/ui/browser_commands.h" |
9 #include "chrome/browser/ui/browser_finder.h" | 9 #include "chrome/browser/ui/browser_finder.h" |
10 #include "chrome/browser/ui/browser_tabrestore.h" | 10 #include "chrome/browser/ui/browser_tabrestore.h" |
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
96 if (browser) | 96 if (browser) |
97 return browser->tab_restore_service_delegate(); | 97 return browser->tab_restore_service_delegate(); |
98 else | 98 else |
99 return NULL; | 99 return NULL; |
100 } | 100 } |
101 | 101 |
102 // static | 102 // static |
103 TabRestoreServiceDelegate* TabRestoreServiceDelegate::FindDelegateForController( | 103 TabRestoreServiceDelegate* TabRestoreServiceDelegate::FindDelegateForController( |
104 const NavigationController* controller, | 104 const NavigationController* controller, |
105 int* index) { | 105 int* index) { |
106 Browser* browser = browser::FindBrowserForController(controller, index); | 106 // TODO(beng): Remove. Used just to see if this function is 2% slower than |
| 107 // FindBrowserForController on Mac 10.6 intl1 |
| 108 Browser* browser = browser::FindBrowserWithWebContents( |
| 109 controller->GetWebContents()); |
| 110 // Browser* browser = browser::FindBrowserForController(controller, index); |
107 if (browser) | 111 if (browser) |
108 return browser->tab_restore_service_delegate(); | 112 return browser->tab_restore_service_delegate(); |
109 else | 113 else |
110 return NULL; | 114 return NULL; |
111 } | 115 } |
112 | 116 |
113 // static | 117 // static |
114 TabRestoreServiceDelegate* TabRestoreServiceDelegate::FindDelegateWithID( | 118 TabRestoreServiceDelegate* TabRestoreServiceDelegate::FindDelegateWithID( |
115 SessionID::id_type desired_id) { | 119 SessionID::id_type desired_id) { |
116 Browser* browser = browser::FindBrowserWithID(desired_id); | 120 Browser* browser = browser::FindBrowserWithID(desired_id); |
117 if (browser) | 121 if (browser) |
118 return browser->tab_restore_service_delegate(); | 122 return browser->tab_restore_service_delegate(); |
119 else | 123 else |
120 return NULL; | 124 return NULL; |
121 } | 125 } |
OLD | NEW |