Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(947)

Unified Diff: chrome/browser/extensions/api/tabs/tabs.cc

Issue 11348344: Remove last usages of FindTabbedBrowserDeprecated. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Dear Greg. Moar context. Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « PRESUBMIT.py ('k') | chrome/browser/extensions/extension_install_ui_default.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/tabs/tabs.cc
diff --git a/chrome/browser/extensions/api/tabs/tabs.cc b/chrome/browser/extensions/api/tabs/tabs.cc
index 3b92c40d88a7e4064c0ee1f98ab691518398e886..724f487d05f523e0cdbf6b5cb9ad3d2985554180 100644
--- a/chrome/browser/extensions/api/tabs/tabs.cc
+++ b/chrome/browser/extensions/api/tabs/tabs.cc
@@ -238,7 +238,7 @@ Browser* CreateBrowserWindow(const Browser::CreateParams& params,
// The false parameter passed below is to ensure that we find a browser
// object matching the profile passed in, instead of the original profile
new_window = browser::FindTabbedBrowser(
- profile, false, chrome::GetActiveDesktop());
+ profile, false, params.host_desktop_type);
if (!new_window)
new_window = new Browser(params);
@@ -615,6 +615,7 @@ bool CreateWindowFunction::RunImpl() {
window_profile);
}
create_params.initial_show_state = ui::SHOW_STATE_NORMAL;
+ create_params.host_desktop_type = chrome::GetActiveDesktop();
Browser* new_window = CreateBrowserWindow(create_params, window_profile,
extension_id);
@@ -997,8 +998,8 @@ bool CreateTabFunction::RunImpl() {
// Ensure the selected browser is tabbed.
if (!browser->is_type_tabbed() && browser->IsAttemptingToCloseBrowser())
- browser = browser::FindTabbedBrowserDeprecated(profile(),
- include_incognito());
+ browser = browser::FindTabbedBrowser(profile(), include_incognito(),
+ browser->host_desktop_type());
if (!browser || !browser->window())
return false;
@@ -1064,9 +1065,12 @@ bool CreateTabFunction::RunImpl() {
!GetExtension()->incognito_split_mode() &&
browser->profile()->IsOffTheRecord()) {
Profile* profile = browser->profile()->GetOriginalProfile();
- browser = browser::FindTabbedBrowserDeprecated(profile, false);
+ chrome::HostDesktopType desktop_type = browser->host_desktop_type();
+
+ browser = browser::FindTabbedBrowser(profile, false, desktop_type);
if (!browser) {
- browser = new Browser(Browser::CreateParams(profile));
+ browser = new Browser(Browser::CreateParams(Browser::TYPE_TABBED,
+ profile, desktop_type));
browser->window()->Show();
}
}
« no previous file with comments | « PRESUBMIT.py ('k') | chrome/browser/extensions/extension_install_ui_default.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698