Merge DOMUIContents into WebContents.

I did a lot of cleanup of the DOM UI system as part of this.
Review URL: http://codereview.chromium.org/42227

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

2 files changed, 5 insertions, 27 deletions

diff --git a/chrome/browser/extensions/extensions_ui.cc b/chrome/browser/extensions/extensions_ui.cc
index 6c1c918..3048172 100644
--- a/chrome/browser/extensions/extensions_ui.cc
+++ b/chrome/browser/extensions/extensions_ui.cc
@@ -18,9 +18,6 @@
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 
-// ExtensionsUI is accessible from chrome-ui://extensions.
-static const char kExtensionsHost[] = "extensions";
-
 ////////////////////////////////////////////////////////////////////////////////
 //
 // ExtensionsHTMLSource
@@ -28,7 +25,7 @@ static const char kExtensionsHost[] = "extensions";
 ////////////////////////////////////////////////////////////////////////////////
 
 ExtensionsUIHTMLSource::ExtensionsUIHTMLSource()
-    : DataSource(kExtensionsHost, MessageLoop::current()) {
+    : DataSource(chrome::kChromeUIExtensionsHost, MessageLoop::current()) {
 }
 
 void ExtensionsUIHTMLSource::StartDataRequest(const std::string& path,
@@ -150,11 +147,8 @@ ExtensionsDOMHandler::~ExtensionsDOMHandler() {
 void ExtensionsDOMHandler::Init() {
 }
 
-ExtensionsUI::ExtensionsUI(DOMUIContents* contents) : DOMUI(contents) {
-}
-
-void ExtensionsUI::Init() {
-  ExtensionsService *exstension_service = get_profile()->GetExtensionsService();
+ExtensionsUI::ExtensionsUI(WebContents* contents) : DOMUI(contents) {
+  ExtensionsService *exstension_service = GetProfile()->GetExtensionsService();
 
   ExtensionsDOMHandler* handler = new ExtensionsDOMHandler(this,
       exstension_service);
@@ -168,11 +162,3 @@ void ExtensionsUI::Init() {
       NewRunnableMethod(&chrome_url_data_manager,
           &ChromeURLDataManager::AddDataSource, html_source));
 }
-
-// static
-GURL ExtensionsUI::GetBaseURL() {
-  std::string url = DOMUIContents::GetScheme();
-  url += chrome::kStandardSchemeSeparator;
-  url += kExtensionsHost;
-  return GURL(url);
-}
diff --git a/chrome/browser/extensions/extensions_ui.h b/chrome/browser/extensions/extensions_ui.h
index 457c73e..7234fea 100644
--- a/chrome/browser/extensions/extensions_ui.h
+++ b/chrome/browser/extensions/extensions_ui.h
@@ -7,8 +7,8 @@
 
 #include <string>
 
+#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/dom_ui/dom_ui.h"
-#include "chrome/browser/dom_ui/dom_ui_contents.h"
 #include "chrome/browser/extensions/extensions_service.h"
 
 class GURL;
@@ -58,17 +58,9 @@ class ExtensionsDOMHandler : public DOMMessageHandler {
 
 class ExtensionsUI : public DOMUI {
  public:
-  explicit ExtensionsUI(DOMUIContents* contents);
-
-  // Return the URL for the front page of this UI.
-  static GURL GetBaseURL();
-
-  // DOMUI Implementation
-  virtual void Init();
+  explicit ExtensionsUI(WebContents* contents);
 
  private:
-  DOMUIContents* contents_;
-
   DISALLOW_COPY_AND_ASSIGN(ExtensionsUI);
 };