Rename WebUI to WebUIImpl.

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

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

4 files changed, 19 insertions, 15 deletions

diff --git a/content/browser/tab_contents/render_view_host_manager.cc b/content/browser/tab_contents/render_view_host_manager.cc
index 4a968ed..f2ea2ae 100644
--- a/content/browser/tab_contents/render_view_host_manager.cc
+++ b/content/browser/tab_contents/render_view_host_manager.cc
@@ -15,7 +15,7 @@
 #include "content/browser/site_instance.h"
 #include "content/browser/tab_contents/navigation_controller_impl.h"
 #include "content/browser/tab_contents/navigation_entry_impl.h"
-#include "content/browser/webui/web_ui.h"
+#include "content/browser/webui/web_ui_impl.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/notification_service.h"
@@ -216,7 +216,7 @@ void RenderViewHostManager::DidNavigateMainFrame(
   }
 }
 
-void RenderViewHostManager::SetWebUIPostCommit(WebUI* web_ui) {
+void RenderViewHostManager::SetWebUIPostCommit(WebUIImpl* web_ui) {
   DCHECK(!web_ui_.get());
   web_ui_.reset(web_ui);
 }
diff --git a/content/browser/tab_contents/render_view_host_manager.h b/content/browser/tab_contents/render_view_host_manager.h
index 84eff55..ae15dca 100644
--- a/content/browser/tab_contents/render_view_host_manager.h
+++ b/content/browser/tab_contents/render_view_host_manager.h
@@ -19,7 +19,7 @@ class InterstitialPage;
 class NavigationControllerImpl;
 class RenderViewHost;
 class RenderWidgetHostView;
-class WebUI;
+class WebUIImpl;
 
 namespace content {
 class BrowserContext;
@@ -68,7 +68,7 @@ class CONTENT_EXPORT RenderViewHostManager
     // Creates a WebUI object for the given URL if one applies. Ownership of the
     // returned pointer will be passed to the caller. If no WebUI applies,
     // returns NULL.
-    virtual WebUI* CreateWebUIForRenderManager(const GURL& url) = 0;
+    virtual WebUIImpl* CreateWebUIForRenderManager(const GURL& url) = 0;
 
     // Returns the navigation entry of the current navigation, or NULL if there
     // is none.
@@ -123,10 +123,10 @@ class CONTENT_EXPORT RenderViewHostManager
   }
 
   // Returns the current committed Web UI or NULL if none applies.
-  WebUI* web_ui() const { return web_ui_.get(); }
+  WebUIImpl* web_ui() const { return web_ui_.get(); }
 
   // Returns the Web UI for the pending navigation, or NULL of none applies.
-  WebUI* pending_web_ui() const { return pending_web_ui_.get(); }
+  WebUIImpl* pending_web_ui() const { return pending_web_ui_.get(); }
 
   // Called when we want to instruct the renderer to navigate to the given
   // navigation entry. It may create a new RenderViewHost or re-use an existing
@@ -154,7 +154,7 @@ class CONTENT_EXPORT RenderViewHostManager
   // Set the WebUI after committing a page load. This is useful for navigations
   // initiated from a renderer, where we want to give the new renderer WebUI
   // privileges from the originating renderer.
-  void SetWebUIPostCommit(WebUI* web_ui);
+  void SetWebUIPostCommit(WebUIImpl* web_ui);
 
   // Called when a provisional load on the given renderer is aborted.
   void RendererAbortedProvisionalLoad(RenderViewHost* render_view_host);
@@ -265,7 +265,7 @@ class CONTENT_EXPORT RenderViewHostManager
   // non-DOM-UI pages). This object is responsible for all communication with
   // a child RenderView instance.
   RenderViewHost* render_view_host_;
-  scoped_ptr<WebUI> web_ui_;
+  scoped_ptr<WebUIImpl> web_ui_;
 
   // A RenderViewHost used to load a cross-site page. This remains hidden
   // while a cross-site request is pending until it calls DidNavigate. It may
@@ -277,7 +277,7 @@ class CONTENT_EXPORT RenderViewHostManager
   // the RVH won't be swapped, so the pending pointer will be unused, but there
   // will be a pending Web UI associated with the navigation.
   RenderViewHost* pending_render_view_host_;
-  scoped_ptr<WebUI> pending_web_ui_;
+  scoped_ptr<WebUIImpl> pending_web_ui_;
 
   // A map of site instance ID to swapped out RenderViewHosts.
   typedef base::hash_map<int32, RenderViewHost*> RenderViewHostMap;
diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc
index be56eb2..1b6fe89 100644
--- a/content/browser/tab_contents/tab_contents.cc
+++ b/content/browser/tab_contents/tab_contents.cc
@@ -31,6 +31,7 @@
 #include "content/browser/tab_contents/navigation_entry_impl.h"
 #include "content/browser/tab_contents/provisional_load_details.h"
 #include "content/browser/tab_contents/title_updated_details.h"
+#include "content/browser/webui/web_ui_impl.h"
 #include "content/common/intents_messages.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/browser_context.h"
@@ -122,6 +123,7 @@ using content::SSLStatus;
 using content::UserMetricsAction;
 using content::WebContents;
 using content::WebContentsObserver;
+using content::WebUI;
 using content::WebUIController;
 
 namespace {
@@ -304,8 +306,10 @@ RenderViewHostManager* TabContents::GetRenderManagerForTesting() {
 }
 
 bool TabContents::OnMessageReceived(const IPC::Message& message) {
-  if (GetWebUI() && static_cast<WebUI*>(GetWebUI())->OnMessageReceived(message))
+  if (GetWebUI() &&
+      static_cast<WebUIImpl*>(GetWebUI())->OnMessageReceived(message)) {
     return true;
+  }
 
   ObserverListBase<WebContentsObserver>::Iterator it(observers_);
   WebContentsObserver* observer;
@@ -434,7 +438,7 @@ content::WebContentsView* TabContents::GetView() const {
 }
 
 content::WebUI* TabContents::CreateWebUI(const GURL& url) {
-  WebUI* web_ui = new WebUI(this);
+  WebUIImpl* web_ui = new WebUIImpl(this);
   WebUIController* controller =
       content::GetContentClient()->browser()->GetWebUIFactory()->
           CreateWebUIForURL(web_ui, url);
@@ -1481,7 +1485,7 @@ void TabContents::DidNavigateMainFramePostCommit(
     // that opened the window, as long as both renderers have the same
     // privileges.
     if (delegate_ && opener_web_ui_type_ == GetWebUITypeForCurrentState()) {
-      WebUI* web_ui = static_cast<WebUI*>(CreateWebUI(GetURL()));
+      WebUIImpl* web_ui = static_cast<WebUIImpl*>(CreateWebUI(GetURL()));
       // web_ui might be NULL if the URL refers to a non-existent extension.
       if (web_ui) {
         render_manager_.SetWebUIPostCommit(web_ui);
@@ -2192,8 +2196,8 @@ NavigationControllerImpl& TabContents::GetControllerForRenderManager() {
   return GetControllerImpl();
 }
 
-WebUI* TabContents::CreateWebUIForRenderManager(const GURL& url) {
-  return static_cast<WebUI*>(CreateWebUI(url));
+WebUIImpl* TabContents::CreateWebUIForRenderManager(const GURL& url) {
+  return static_cast<WebUIImpl*>(CreateWebUI(url));
 }
 
 NavigationEntry*
diff --git a/content/browser/tab_contents/tab_contents.h b/content/browser/tab_contents/tab_contents.h
index 65519d6..058e650 100644
--- a/content/browser/tab_contents/tab_contents.h
+++ b/content/browser/tab_contents/tab_contents.h
@@ -326,7 +326,7 @@ class CONTENT_EXPORT TabContents
   virtual void UpdateRenderViewSizeForRenderManager() OVERRIDE;
   virtual void NotifySwappedFromRenderManager() OVERRIDE;
   virtual NavigationControllerImpl& GetControllerForRenderManager() OVERRIDE;
-  virtual WebUI* CreateWebUIForRenderManager(const GURL& url) OVERRIDE;
+  virtual WebUIImpl* CreateWebUIForRenderManager(const GURL& url) OVERRIDE;
   virtual content::NavigationEntry*
       GetLastCommittedNavigationEntryForRenderManager() OVERRIDE;
   virtual bool FocusLocationBarByDefault() OVERRIDE;