commit 01ec4ec8ef85dc181f3744fdb6fd41cab7b00018
author jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed Jan 18 04:13:47 2012
committer jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed Jan 18 04:13:47 2012
tree e8208faaa428979491fc36130c11c6257ce2a91d
parent b729f1fca403a7b2424e78fe3257683637e6b1d1

Switch chrome code to use content::WebUI interface instead of WebUI concrete class. The latter will be renamed to WebUIImpl in a followup change. This completes hiding WebUI from chrome code, and now we can block it through DEPS.

BUG=98716
Review URL: https://chromiumcodereview.appspot.com/9241032

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118038 0039d316-1c4b-4281-b951-d872f2087c98

content/browser/tab_contents/tab_contents.h

diff --git a/content/browser/tab_contents/tab_contents.h b/content/browser/tab_contents/tab_contents.h
index b8d6fd81..56539a1 100644
--- a/content/browser/tab_contents/tab_contents.h
+++ b/content/browser/tab_contents/tab_contents.h
@@ -105,7 +105,7 @@
     render_manager_.remove_interstitial_page();
   }
 
-  void set_opener_web_ui_type(WebUI::TypeID opener_web_ui_type) {
+  void set_opener_web_ui_type(content::WebUI::TypeID opener_web_ui_type) {
     opener_web_ui_type_ = opener_web_ui_type;
   }
 
@@ -133,9 +133,9 @@
   virtual RenderViewHost* GetRenderViewHost() const OVERRIDE;
   virtual RenderWidgetHostView* GetRenderWidgetHostView() const OVERRIDE;
   virtual TabContentsView* GetView() const OVERRIDE;
-  virtual WebUI* CreateWebUI(const GURL& url) OVERRIDE;
-  virtual WebUI* GetWebUI() const OVERRIDE;
-  virtual WebUI* GetCommittedWebUI() const OVERRIDE;
+  virtual content::WebUI* CreateWebUI(const GURL& url) OVERRIDE;
+  virtual content::WebUI* GetWebUI() const OVERRIDE;
+  virtual content::WebUI* GetCommittedWebUI() const OVERRIDE;
   virtual const string16& GetTitle() const OVERRIDE;
   virtual int32 GetMaxPageID() OVERRIDE;
   virtual int32 GetMaxPageIDForSiteInstance(
@@ -207,8 +207,8 @@
   virtual int GetMaximumZoomPercent() const OVERRIDE;
   virtual gfx::Size GetPreferredSize() const OVERRIDE;
   virtual int GetContentRestrictions() const OVERRIDE;
-  virtual WebUI::TypeID GetWebUITypeForCurrentState() OVERRIDE;
-  virtual WebUI* GetWebUIForCurrentState() OVERRIDE;
+  virtual content::WebUI::TypeID GetWebUITypeForCurrentState() OVERRIDE;
+  virtual content::WebUI* GetWebUIForCurrentState() OVERRIDE;
   virtual bool GotResponseToLockMouseRequest(bool allowed) OVERRIDE;
 
   // Implementation of PageNavigator.
@@ -609,7 +609,7 @@
 
   // If this tab was created from a renderer using window.open, this will be
   // non-NULL and represent the WebUI of the opening renderer.
-  WebUI::TypeID opener_web_ui_type_;
+  content::WebUI::TypeID opener_web_ui_type_;
 
   // The time that we started to create the new tab page.
   base::TimeTicks new_tab_start_time_;