OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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_commands.h" | 5 #include "chrome/browser/ui/browser_commands.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/metrics/histogram.h" | 8 #include "base/metrics/histogram.h" |
9 #include "base/prefs/pref_service.h" | 9 #include "base/prefs/pref_service.h" |
10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
(...skipping 648 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
659 // window next to the tab being duplicated. | 659 // window next to the tab being duplicated. |
660 int index = browser->tab_strip_model()->GetIndexOfWebContents(contents); | 660 int index = browser->tab_strip_model()->GetIndexOfWebContents(contents); |
661 pinned = browser->tab_strip_model()->IsTabPinned(index); | 661 pinned = browser->tab_strip_model()->IsTabPinned(index); |
662 int add_types = TabStripModel::ADD_ACTIVE | | 662 int add_types = TabStripModel::ADD_ACTIVE | |
663 TabStripModel::ADD_INHERIT_GROUP | | 663 TabStripModel::ADD_INHERIT_GROUP | |
664 (pinned ? TabStripModel::ADD_PINNED : 0); | 664 (pinned ? TabStripModel::ADD_PINNED : 0); |
665 browser->tab_strip_model()->InsertWebContentsAt( | 665 browser->tab_strip_model()->InsertWebContentsAt( |
666 index + 1, contents_dupe, add_types); | 666 index + 1, contents_dupe, add_types); |
667 } else { | 667 } else { |
668 Browser* new_browser = NULL; | 668 Browser* new_browser = NULL; |
669 if (browser->is_app() && | 669 if (browser->is_app() && browser->type() != Browser::TYPE_TABBED) { |
670 !browser->is_type_popup()) { | |
671 new_browser = new Browser( | 670 new_browser = new Browser( |
672 Browser::CreateParams::CreateForApp(browser->type(), | 671 Browser::CreateParams::CreateForApp(browser->type(), |
673 browser->app_name(), | 672 browser->app_name(), |
674 gfx::Rect(), | 673 gfx::Rect(), |
675 browser->profile(), | 674 browser->profile(), |
676 browser->host_desktop_type())); | 675 browser->host_desktop_type())); |
677 } else { | 676 } else { |
678 new_browser = new Browser( | 677 new_browser = new Browser( |
679 Browser::CreateParams(browser->type(), browser->profile(), | 678 Browser::CreateParams(browser->type(), browser->profile(), |
680 browser->host_desktop_type())); | 679 browser->host_desktop_type())); |
(...skipping 571 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1252 void ConvertTabToAppWindow(Browser* browser, | 1251 void ConvertTabToAppWindow(Browser* browser, |
1253 content::WebContents* contents) { | 1252 content::WebContents* contents) { |
1254 const GURL& url = contents->GetController().GetActiveEntry()->GetURL(); | 1253 const GURL& url = contents->GetController().GetActiveEntry()->GetURL(); |
1255 std::string app_name = web_app::GenerateApplicationNameFromURL(url); | 1254 std::string app_name = web_app::GenerateApplicationNameFromURL(url); |
1256 | 1255 |
1257 int index = browser->tab_strip_model()->GetIndexOfWebContents(contents); | 1256 int index = browser->tab_strip_model()->GetIndexOfWebContents(contents); |
1258 if (index >= 0) | 1257 if (index >= 0) |
1259 browser->tab_strip_model()->DetachWebContentsAt(index); | 1258 browser->tab_strip_model()->DetachWebContentsAt(index); |
1260 | 1259 |
1261 Browser* app_browser = new Browser( | 1260 Browser* app_browser = new Browser( |
1262 Browser::CreateParams::CreateForApp( | 1261 Browser::CreateParams::CreateForApp(Browser::TYPE_TRUSTED_POPUP, |
1263 Browser::TYPE_POPUP, app_name, gfx::Rect(), browser->profile(), | 1262 app_name, |
1264 browser->host_desktop_type())); | 1263 gfx::Rect(), |
| 1264 browser->profile(), |
| 1265 browser->host_desktop_type())); |
1265 app_browser->tab_strip_model()->AppendWebContents(contents, true); | 1266 app_browser->tab_strip_model()->AppendWebContents(contents, true); |
1266 | 1267 |
1267 contents->GetMutableRendererPrefs()->can_accept_load_drops = false; | 1268 contents->GetMutableRendererPrefs()->can_accept_load_drops = false; |
1268 contents->GetRenderViewHost()->SyncRendererPrefs(); | 1269 contents->GetRenderViewHost()->SyncRendererPrefs(); |
1269 app_browser->window()->Show(); | 1270 app_browser->window()->Show(); |
1270 } | 1271 } |
1271 | 1272 |
1272 } // namespace chrome | 1273 } // namespace chrome |
OLD | NEW |