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

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

Issue 11624036: Move the parsing of homepage_url" and "devtools_page" out of Extension. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Review comments addressed Created 8 years 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/extensions/extension_context_menu_model.cc
diff --git a/chrome/browser/extensions/extension_context_menu_model.cc b/chrome/browser/extensions/extension_context_menu_model.cc
index ce6b6e8823ee8ef5dcfd3275e43d77eb8b8d1947..d4eae56ad4544fd6db787069796b9cc8ed9a5043 100644
--- a/chrome/browser/extensions/extension_context_menu_model.cc
+++ b/chrome/browser/extensions/extension_context_menu_model.cc
@@ -18,6 +18,7 @@
#include "chrome/browser/ui/chrome_pages.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_constants.h"
+#include "chrome/common/extensions/manifest_url_info.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h"
#include "content/public/browser/web_contents.h"
@@ -29,6 +30,7 @@ using content::OpenURLParams;
using content::Referrer;
using content::WebContents;
using extensions::Extension;
+using extensions::ManifestURLInfo;
ExtensionContextMenuModel::ExtensionContextMenuModel(
const Extension* extension,
@@ -73,7 +75,7 @@ bool ExtensionContextMenuModel::IsCommandIdEnabled(int command_id) const {
} else if (command_id == NAME) {
// The NAME links to the Homepage URL. If the extension doesn't have a
// homepage, we just disable this menu item.
- return extension->GetHomepageURL().is_valid();
+ return ManifestURLInfo::GetHomepageURL(extension).is_valid();
} else if (command_id == INSPECT_POPUP) {
WebContents* web_contents = chrome::GetActiveWebContents(browser_);
if (!web_contents)
@@ -101,9 +103,9 @@ void ExtensionContextMenuModel::ExecuteCommand(int command_id) {
switch (command_id) {
case NAME: {
- OpenURLParams params(extension->GetHomepageURL(), Referrer(),
- NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK,
- false);
+ OpenURLParams params(ManifestURLInfo::GetHomepageURL(extension),
+ Referrer(), NEW_FOREGROUND_TAB,
+ content::PAGE_TRANSITION_LINK, false);
browser_->OpenURL(params);
break;
}

Powered by Google App Engine
This is Rietveld 408576698