| 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_list.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" |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 // Implementations of TabRestoreServiceDelegate static methods | 78 // Implementations of TabRestoreServiceDelegate static methods |
| 79 | 79 |
| 80 // static | 80 // static |
| 81 TabRestoreServiceDelegate* TabRestoreServiceDelegate::Create( | 81 TabRestoreServiceDelegate* TabRestoreServiceDelegate::Create( |
| 82 Profile* profile, | 82 Profile* profile, |
| 83 const std::string& app_name) { | 83 const std::string& app_name) { |
| 84 Browser* browser; | 84 Browser* browser; |
| 85 if (app_name.empty()) { | 85 if (app_name.empty()) { |
| 86 browser = Browser::Create(profile); | 86 browser = Browser::Create(profile); |
| 87 } else { | 87 } else { |
| 88 browser = Browser::CreateForApp( | 88 browser = Browser::CreateWithParams( |
| 89 Browser::TYPE_POPUP, | 89 Browser::CreateParams::CreateForApp( |
| 90 app_name, | 90 Browser::TYPE_POPUP, app_name, gfx::Rect(), profile)); |
| 91 gfx::Rect(), | |
| 92 profile); | |
| 93 } | 91 } |
| 94 if (browser) | 92 if (browser) |
| 95 return browser->tab_restore_service_delegate(); | 93 return browser->tab_restore_service_delegate(); |
| 96 else | 94 else |
| 97 return NULL; | 95 return NULL; |
| 98 } | 96 } |
| 99 | 97 |
| 100 // static | 98 // static |
| 101 TabRestoreServiceDelegate* TabRestoreServiceDelegate::FindDelegateForController( | 99 TabRestoreServiceDelegate* TabRestoreServiceDelegate::FindDelegateForController( |
| 102 const NavigationController* controller, | 100 const NavigationController* controller, |
| 103 int* index) { | 101 int* index) { |
| 104 Browser* browser = Browser::GetBrowserForController(controller, index); | 102 Browser* browser = Browser::GetBrowserForController(controller, index); |
| 105 if (browser) | 103 if (browser) |
| 106 return browser->tab_restore_service_delegate(); | 104 return browser->tab_restore_service_delegate(); |
| 107 else | 105 else |
| 108 return NULL; | 106 return NULL; |
| 109 } | 107 } |
| 110 | 108 |
| 111 // static | 109 // static |
| 112 TabRestoreServiceDelegate* TabRestoreServiceDelegate::FindDelegateWithID( | 110 TabRestoreServiceDelegate* TabRestoreServiceDelegate::FindDelegateWithID( |
| 113 SessionID::id_type desired_id) { | 111 SessionID::id_type desired_id) { |
| 114 Browser* browser = BrowserList::FindBrowserWithID(desired_id); | 112 Browser* browser = BrowserList::FindBrowserWithID(desired_id); |
| 115 if (browser) | 113 if (browser) |
| 116 return browser->tab_restore_service_delegate(); | 114 return browser->tab_restore_service_delegate(); |
| 117 else | 115 else |
| 118 return NULL; | 116 return NULL; |
| 119 } | 117 } |
| OLD | NEW |