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

Unified Diff: chrome/browser/devtools/devtools_window.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: patch-rebased- 2 Created 7 years, 11 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 | « no previous file | chrome/browser/extensions/api/developer_private/developer_private_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/devtools/devtools_window.cc
diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc
index 8c9fbe1dc719d1ce6b91dac0c92b4945af8fd7ef..aa346054a1d029e5e7f9a53ea9a08c8daa2176c2 100644
--- a/chrome/browser/devtools/devtools_window.cc
+++ b/chrome/browser/devtools/devtools_window.cc
@@ -30,6 +30,7 @@
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/chrome_switches.h"
+#include "chrome/common/extensions/manifest_url_handler.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/render_messages.h"
#include "chrome/common/url_constants.h"
@@ -484,11 +485,11 @@ void DevToolsWindow::AddDevToolsExtensionsToClient() {
for (ExtensionSet::const_iterator extension = extensions->begin();
extension != extensions->end(); ++extension) {
- if ((*extension)->devtools_url().is_empty())
+ if (extensions::ManifestURL::GetDevToolsPage(*extension).is_empty())
continue;
DictionaryValue* extension_info = new DictionaryValue();
- extension_info->Set("startPage",
- new StringValue((*extension)->devtools_url().spec()));
+ extension_info->Set("startPage", new StringValue(
+ extensions::ManifestURL::GetDevToolsPage(*extension).spec()));
extension_info->Set("name", new StringValue((*extension)->name()));
bool allow_experimental = (*extension)->HasAPIPermission(
extensions::APIPermission::kExperimental);
« no previous file with comments | « no previous file | chrome/browser/extensions/api/developer_private/developer_private_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698