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

Unified Diff: chrome/browser/automation/testing_automation_provider.cc

Issue 11742005: Move [Homepage,Options,Update,DevTools]URL out of Extension (Closed) Base URL: http://git.chromium.org/chromium/src.git@dc_unref_browser_action
Patch Set: Created 7 years, 12 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/devtools/devtools_window.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/automation/testing_automation_provider.cc
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index 012fb4922c3121bcfa754f7a63a1ea36ffb120fb..56a3a563ac1328d7081b8214c831a6e6bd1f0fcb 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -120,6 +120,7 @@
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
+#include "chrome/common/extensions/api/extension_urls/extension_urls_handler.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/permissions/permission_set.h"
#include "chrome/common/pref_names.h"
@@ -3724,8 +3725,9 @@ void TestingAutomationProvider::GetExtensionsInfo(DictionaryValue* args,
extension_value->SetString("description", extension->description());
extension_value->SetString("background_url",
extension->GetBackgroundURL().spec());
- extension_value->SetString("options_url",
- extension->options_url().spec());
+ extension_value->SetString(
+ "options_url",
+ extensions::ExtensionURL::GetOptionsURL(extension).spec());
extension_value->Set("host_permissions",
GetHostPermissions(extension, false));
extension_value->Set("effective_host_permissions",
« no previous file with comments | « no previous file | chrome/browser/devtools/devtools_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698