diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-13 20:28:08 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-13 20:28:08 +0000 |
commit | 618e1575abe7998be3579a1555643e12bcdb402d (patch) | |
tree | e0ed5e71e4952876bec10938182a2d50614103a7 | |
parent | 8c3bb0ac2ad533ca21f90f1b03cd2b6485b08815 (diff) | |
download | chromium_src-618e1575abe7998be3579a1555643e12bcdb402d.zip chromium_src-618e1575abe7998be3579a1555643e12bcdb402d.tar.gz chromium_src-618e1575abe7998be3579a1555643e12bcdb402d.tar.bz2 |
Fix chrome://chrome breaking from r117645
Review URL: http://codereview.chromium.org/9174010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117680 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/browser/ui/webui/uber/uber_ui.cc | 7 | ||||
-rw-r--r-- | content/browser/webui/web_ui.h | 10 |
2 files changed, 10 insertions, 7 deletions
diff --git a/chrome/browser/ui/webui/uber/uber_ui.cc b/chrome/browser/ui/webui/uber/uber_ui.cc index 5920a6f..1bf35c6 100644 --- a/chrome/browser/ui/webui/uber/uber_ui.cc +++ b/chrome/browser/ui/webui/uber/uber_ui.cc @@ -106,6 +106,9 @@ bool UberUI::OverrideHandleWebUIMessage(const GURL& source_url, } // The message was sent from a subpage. - return subpage->second->controller()->OverrideHandleWebUIMessage( - source_url, message, args); + // TODO(jam) fix this to use interface + //return subpage->second->controller()->OverrideHandleWebUIMessage( + // source_url, message, args); + subpage->second->OnWebUISend(source_url, message, args); + return true; } diff --git a/content/browser/webui/web_ui.h b/content/browser/webui/web_ui.h index 9997f41..f804b00 100644 --- a/content/browser/webui/web_ui.h +++ b/content/browser/webui/web_ui.h @@ -43,6 +43,11 @@ class CONTENT_EXPORT WebUI : public IPC::Channel::Listener { // IPC::Channel::Listener implementation: virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + // TODO(jam): move to private + // IPC message handling. + void OnWebUISend(const GURL& source_url, + const std::string& message, + const base::ListValue& args); // Called by TabContents when the RenderView is first created. This is *not* // called for every page load because in some cases RenderViewHostManager will @@ -179,11 +184,6 @@ class CONTENT_EXPORT WebUI : public IPC::Channel::Listener { content::WebUIController* controller_; private: - // IPC message handling. - void OnWebUISend(const GURL& source_url, - const std::string& message, - const base::ListValue& args); - // A map of message name -> message handling callback. typedef std::map<std::string, MessageCallback> MessageCallbackMap; MessageCallbackMap message_callbacks_; |