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

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: Created 7 years, 9 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/ui/browser_browsertest.cc ('k') | chrome/browser/ui/tabs/pinned_tab_codec.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 b420330852494d438c288427899ff734b70f2008..42f8d9ec07d80002e0b1069cabb390efce074859 100644
--- a/chrome/browser/ui/extensions/application_launch.cc
+++ b/chrome/browser/ui/extensions/application_launch.cc
@@ -24,6 +24,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"
@@ -63,7 +64,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.
@@ -124,8 +125,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));
}
if (!override_bounds.IsEmpty())
window_bounds = override_bounds;
« no previous file with comments | « chrome/browser/ui/browser_browsertest.cc ('k') | chrome/browser/ui/tabs/pinned_tab_codec.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698