Move WebUIMessageHandler to its own file in the public directory and put it in the content namesp...

content/browser/webui/web_ui.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_WEBUI_WEB_UI_H_
 #define CONTENT_BROWSER_WEBUI_WEB_UI_H_
 #pragma once
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/callback_old.h"
 #include "base/compiler_specific.h"
 #include "base/string16.h"
 #include "content/common/content_export.h"
 #include "content/public/common/page_transition_types.h"
 #include "ipc/ipc_channel.h"
 
 class GURL;
 class RenderViewHost;
-class WebUIMessageHandler;
 
 namespace base {
-class DictionaryValue;
 class ListValue;
 class Value;
 }
 
 namespace content {
 class WebContents;
+class WebUIMessageHandler;
 }
 
 // A WebUI sets up the datasources and message handlers for a given HTML-based
 // UI.
 //
 // NOTE: If you're creating a new WebUI for Chrome code, make sure you extend
 // ChromeWebUI.
 class CONTENT_EXPORT WebUI : public IPC::Channel::Listener {
  public:
   explicit WebUI(content::WebContents* contents);
@@ skipping 117 matching lines @@
   static const TypeID kNoWebUI;
 
   // Returns JavaScript code that, when executed, calls the function specified
   // by |function_name| with the arguments specified in |arg_list|.
   static string16 GetJavascriptCall(
       const std::string& function_name,
       const std::vector<const base::Value*>& arg_list);
 
  protected:
   // Takes ownership of |handler|, which will be destroyed when the WebUI is.
-  void AddMessageHandler(WebUIMessageHandler* handler);
+  void AddMessageHandler(content::WebUIMessageHandler* handler);
 
   // Execute a string of raw Javascript on the page.  Overridable for
   // testing purposes.
   virtual void ExecuteJavascript(const string16& javascript);
 
   // Options that may be overridden by individual Web UI implementations. The
   // bool options default to false. See the public getters for more information.
   bool hide_favicon_;
   bool focus_location_bar_by_default_;
   bool should_hide_url_;
   string16 overridden_title_;  // Defaults to empty string.
   content::PageTransition link_transition_type_;  // Defaults to LINK.
   int bindings_;  // The bindings from BindingsPolicy that should be enabled for
                   // this page.
 
   // Used by test mocks. See the public getters for more information.
   bool register_callback_overwrites_;  // Defaults to false.
 
   // The WebUIMessageHandlers we own.
-  std::vector<WebUIMessageHandler*> handlers_;
+  std::vector<content::WebUIMessageHandler*> handlers_;
 
   // Non-owning pointer to the WebContents this WebUI is associated with.
   content::WebContents* web_contents_;
 
  private:
   // A map of message name -> message handling callback.
   typedef std::map<std::string, MessageCallback> MessageCallbackMap;
   MessageCallbackMap message_callbacks_;
 
   // The path for the iframe this WebUI is embedded in (empty if not in an
   // iframe).
   std::string frame_xpath_;
 
   DISALLOW_COPY_AND_ASSIGN(WebUI);
 };
 
-// Messages sent from the DOM are forwarded via the WebUI to handler
-// classes. These objects are owned by WebUI and destroyed when the
-// host is destroyed.
-class CONTENT_EXPORT WebUIMessageHandler {
- public:
-  WebUIMessageHandler();
-  virtual ~WebUIMessageHandler();
-
- protected:
-  // Helper methods:
-
-  // Adds "url" and "title" keys on incoming dictionary, setting title
-  // as the url as a fallback on empty title.
-  static void SetURLAndTitle(base::DictionaryValue* dictionary,
-                             string16 title,
-                             const GURL& gurl);
-
-  // Extract an integer value from a list Value.
-  static bool ExtractIntegerValue(const base::ListValue* value, int* out_int);
-
-  // Extract a floating point (double) value from a list Value.
-  static bool ExtractDoubleValue(const base::ListValue* value,
-                                 double* out_value);
-
-  // Extract a string value from a list Value.
-  static string16 ExtractStringValue(const base::ListValue* value);
-
-  // This is where subclasses specify which messages they'd like to handle and
-  // perform any additional initialization.. At this point web_ui() will return
-  // the associated WebUI object.
-  virtual void RegisterMessages() = 0;
-
-  // Returns the attached WebUI for this handler.
-  WebUI* web_ui() const { return web_ui_; }
-
- private:
-  friend class WebUI;
-  friend class WebUIBrowserTest;
-
-  void set_web_ui(WebUI* web_ui) { web_ui_ = web_ui; }
-
-  WebUI* web_ui_;
-
-  DISALLOW_COPY_AND_ASSIGN(WebUIMessageHandler);
-};
-
 #endif  // CONTENT_BROWSER_WEBUI_WEB_UI_H_