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

Unified Diff: chrome/browser/ui/views/ash/extension_utils.cc

Issue 10700130: Introduce LaunchParams struct for opening chrome apps. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix bad merge Created 8 years, 5 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
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 e00b457d440a0dfbb37c038f284320bac2bbb766..aa81a83f3a7914d64d0e27f0a46c07ff3b351528 100644
--- a/chrome/browser/ui/views/ash/extension_utils.cc
+++ b/chrome/browser/ui/views/ash/extension_utils.cc
@@ -24,31 +24,23 @@ void OpenExtension(Profile* profile,
WindowOpenDisposition disposition =
chrome::DispositionFromEventFlags(event_flags);
-
- GURL url;
- if (extension->id() == extension_misc::kWebStoreAppId)
- url = extension->GetFullLaunchURL();
+ extension_misc::LaunchContainer container;
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, extensions::ExtensionPrefs::LAUNCH_DEFAULT);
-
- application_launch::OpenApplication(
- profile, extension, launch_container, GURL(url),
- NEW_FOREGROUND_TAB, NULL);
+ disposition = NEW_FOREGROUND_TAB;
}
+
+ application_launch::OpenApplication(application_launch::LaunchParams(
+ profile, extension, container, disposition));
}
} // namespace extension_utils

Powered by Google App Engine
This is Rietveld 408576698