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

Unified Diff: chrome/browser/extensions/extension_tabs_module.cc

Issue 9590001: Launch panels as popup windows in Aura, and add separate launcher icon logic for panels. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: . Created 8 years, 10 months 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 | « chrome/browser/extensions/extension_tab_helper.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_tabs_module.cc
diff --git a/chrome/browser/extensions/extension_tabs_module.cc b/chrome/browser/extensions/extension_tabs_module.cc
index 832e6efaa8bbb8f3c0f563f36a5dc50b1f625439..018de67239e46bf09ff24f9a7f61fb8efd3e8d18 100644
--- a/chrome/browser/extensions/extension_tabs_module.cc
+++ b/chrome/browser/extensions/extension_tabs_module.cc
@@ -21,6 +21,7 @@
#include "chrome/browser/extensions/extension_function_dispatcher.h"
#include "chrome/browser/extensions/extension_host.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_tab_helper.h"
#include "chrome/browser/extensions/extension_tab_util.h"
#include "chrome/browser/extensions/extension_tabs_module_constants.h"
#include "chrome/browser/extensions/extension_window_controller.h"
@@ -615,8 +616,12 @@ bool CreateWindowFunction::RunImpl() {
(window_type == Browser::TYPE_PANEL ? panel_bounds : popup_bounds),
window_profile);
}
- for (std::vector<GURL>::iterator i = urls.begin(); i != urls.end(); ++i)
- new_window->AddSelectedTabWithURL(*i, content::PAGE_TRANSITION_LINK);
+ for (std::vector<GURL>::iterator i = urls.begin(); i != urls.end(); ++i) {
+ TabContentsWrapper* tab = new_window->AddSelectedTabWithURL(
+ *i, content::PAGE_TRANSITION_LINK);
+ if (window_type == Browser::TYPE_PANEL)
+ tab->extension_tab_helper()->SetExtensionAppIconById(extension_id);
+ }
if (contents) {
TabStripModel* target_tab_strip = new_window->tabstrip_model();
target_tab_strip->InsertTabContentsAt(urls.size(), contents,
« no previous file with comments | « chrome/browser/extensions/extension_tab_helper.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698