diff options
| author | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-25 22:10:50 +0000 |
|---|---|---|
| committer | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-25 22:10:50 +0000 |
| commit | db7331aecb1f0c01aecf4cd4627d08a8d5b08bc2 (patch) | |
| tree | 5a33fc21cb1628462f9e365add27aeaf058d60fc /chrome/browser/extensions/extension_toolstrip_api.cc | |
| parent | f56abff188b90b7f2d67a094930d7d9407df507d (diff) | |
| download | chromium_src-db7331aecb1f0c01aecf4cd4627d08a8d5b08bc2.zip chromium_src-db7331aecb1f0c01aecf4cd4627d08a8d5b08bc2.tar.gz chromium_src-db7331aecb1f0c01aecf4cd4627d08a8d5b08bc2.tar.bz2 | |
Allow users to enable extensions in incognito. Requires
--enable-experimental-extension-apis . The UI needs work. Tab and window
events are hooked up so that they work with incognito tabs/windows when
enabled.
BUG=32365
BUG=36292
Review URL: http://codereview.chromium.org/657041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40057 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_toolstrip_api.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_toolstrip_api.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/extensions/extension_toolstrip_api.cc b/chrome/browser/extensions/extension_toolstrip_api.cc index 18d1839..56ad0a2 100644 --- a/chrome/browser/extensions/extension_toolstrip_api.cc +++ b/chrome/browser/extensions/extension_toolstrip_api.cc @@ -40,7 +40,7 @@ bool ToolstripFunction::RunImpl() { error_ = kNotAToolstripError; return false; } - Browser* browser = dispatcher()->GetBrowser(); + Browser* browser = GetBrowser(); if (!browser) { error_ = kNotAToolstripError; return false; @@ -133,8 +133,8 @@ void ToolstripEventRouter::DispatchEvent(Profile *profile, std::string json_args; base::JSONWriter::Write(&json, false, &json_args); std::string full_event_name = StringPrintf(event_name, routing_id); - profile->GetExtensionMessageService()-> - DispatchEventToRenderers(full_event_name, json_args); + profile->GetExtensionMessageService()->DispatchEventToRenderers( + full_event_name, json_args, profile->IsOffTheRecord()); } } |