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

Unified Diff: chrome/browser/ui/extensions/application_launch.cc

Issue 12316077: Move the parsing of app.launch related keys out of Extension class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase + review comments addressed Created 7 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
Index: chrome/browser/ui/extensions/application_launch.cc
diff --git a/chrome/browser/ui/extensions/application_launch.cc b/chrome/browser/ui/extensions/application_launch.cc
index 30b15d2cc31485f0b788cfe8924ed25e0db6611a..57aba737d39a52940e1bc17940b177d0e37e20b3 100644
--- a/chrome/browser/ui/extensions/application_launch.cc
+++ b/chrome/browser/ui/extensions/application_launch.cc
@@ -20,6 +20,7 @@
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/browser/web_applications/web_app.h"
#include "chrome/common/chrome_switches.h"
+#include "chrome/common/extensions/app_launcher_info.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_constants.h"
#include "chrome/common/extensions/manifest_url_handler.h"
@@ -59,7 +60,7 @@ GURL UrlForExtension(const Extension* extension,
override_url.GetOrigin() == extension->url());
url = override_url;
} else {
- url = extension->GetFullLaunchURL();
+ url = extensions::AppLauncherInfo::GetFullLaunchURL(extension);
}
// For extensions lacking launch urls, determine a reasonable fallback.
@@ -91,8 +92,10 @@ WebContents* OpenApplicationWindow(
gfx::Rect window_bounds;
if (extension) {
- window_bounds.set_width(extension->launch_width());
- window_bounds.set_height(extension->launch_height());
+ window_bounds.set_width(
+ extensions::AppLauncherInfo::GetLaunchWidth(extension));
+ window_bounds.set_height(
+ extensions::AppLauncherInfo::GetLaunchHeight(extension));
} else if (!override_bounds.IsEmpty()) {
window_bounds = override_bounds;
}

Powered by Google App Engine
This is Rietveld 408576698