Index: chrome/browser/ui/views/ash/extension_utils.cc |
diff --git a/chrome/browser/ui/views/ash/extension_utils.cc b/chrome/browser/ui/views/ash/extension_utils.cc |
index ec7b63b4c64f8bf6cfc6479c15bb2fc0a75725dc..6200bd2dc7b58a6cd6e411f6e7a02a9274e67a9b 100644 |
--- a/chrome/browser/ui/views/ash/extension_utils.cc |
+++ b/chrome/browser/ui/views/ash/extension_utils.cc |
@@ -24,31 +24,29 @@ void OpenExtension(Profile* profile, |
WindowOpenDisposition disposition = |
chrome::DispositionFromEventFlags(event_flags); |
+ extension_misc::LaunchContainer container; |
GURL url; |
if (extension->id() == extension_misc::kWebStoreAppId) |
url = extension->GetFullLaunchURL(); |
if (disposition == NEW_FOREGROUND_TAB || disposition == NEW_BACKGROUND_TAB) { |
- // Opens in a tab. |
- application_launch::OpenApplication( |
- profile, extension, extension_misc::LAUNCH_TAB, url, disposition, NULL); |
+ container = extension_misc::LAUNCH_TAB; |
} else if (disposition == NEW_WINDOW) { |
- // Force a new window open. |
- application_launch::OpenApplication( |
- profile, extension, extension_misc::LAUNCH_WINDOW, url, |
- disposition, NULL); |
+ container = extension_misc::LAUNCH_WINDOW; |
} else { |
// Look at preference to find the right launch container. If no preference |
// is set, launch as a regular tab. |
- extension_misc::LaunchContainer launch_container = |
+ container = |
profile->GetExtensionService()->extension_prefs()->GetLaunchContainer( |
extension, ExtensionPrefs::LAUNCH_DEFAULT); |
- |
- application_launch::OpenApplication( |
- profile, extension, launch_container, GURL(url), |
- NEW_FOREGROUND_TAB, NULL); |
+ disposition = NEW_FOREGROUND_TAB; |
} |
+ |
+ application_launch::LaunchParams params(profile, extension, container, |
+ disposition); |
+ params.override_url = url; |
Mihai Parparita -not on Chrome
2012/07/11 00:38:36
Is this actually needed? The only possible value f
benwells
2012/07/12 04:21:02
Wow yeah, deleted!
|
+ application_launch::OpenApplication(params); |
} |
} // namespace extension_utils |