Simplify WebUI data sources. Currently WebUI data sources implement a URLDataSourceDelegate interfa…

chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 
 #include <string>
 
 #include "ash/ash_switches.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/values.h"
 #include "chrome/browser/browser_about_handler.h"
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
 #include "chrome/browser/chromeos/login/base_login_display_host.h"
 #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen_actor.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/about_ui.h"
-#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/network_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h"
 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/update_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h"
 #include "chrome/browser/ui/webui/options/chromeos/user_image_source.h"
 #include "chrome/browser/ui/webui/theme_source.h"
+#include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/url_constants.h"
-#include "content/public/browser/url_data_source_delegate.h"
+#include "content/public/browser/url_data_source.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/browser_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using content::WebContents;
 
 namespace {
 
 // Path for a stripped down login page that does not have OOBE elements.
 const char kLoginPath[] = "login";
 
 // Path for the enterprise enrollment gaia page hosting.
 const char kEnterpriseEnrollmentGaiaLoginPath[] = "gaialogin";
 
 }  // namespace
 
 namespace chromeos {
 
-class OobeUIHTMLSource : public content::URLDataSourceDelegate {
+class OobeUIHTMLSource : public content::URLDataSource {
  public:
   explicit OobeUIHTMLSource(DictionaryValue* localized_strings);
 
-  // content::URLDataSourceDelegate implementation.
+  // content::URLDataSource implementation.
   virtual std::string GetSource() OVERRIDE;
-  virtual void StartDataRequest(const std::string& path,
-                                bool is_incognito,
-                                int request_id);
+  virtual void StartDataRequest(
+      const std::string& path,
+      bool is_incognito,
+      const content::URLDataSource::GotDataCallback& callback);
   virtual std::string GetMimeType(const std::string&) const {
     return "text/html";
   }
 
  private:
   virtual ~OobeUIHTMLSource() {}
 
   std::string GetDataResource(int resource_id) const;
 
   scoped_ptr<DictionaryValue> localized_strings_;
   DISALLOW_COPY_AND_ASSIGN(OobeUIHTMLSource);
 };
 
 // OobeUIHTMLSource -------------------------------------------------------
 
 OobeUIHTMLSource::OobeUIHTMLSource(DictionaryValue* localized_strings)
     : localized_strings_(localized_strings) {
 }
 
 std::string OobeUIHTMLSource::GetSource() {
   return chrome::kChromeUIOobeHost;
 }
 
-void OobeUIHTMLSource::StartDataRequest(const std::string& path,
-                                        bool is_incognito,
-                                        int request_id) {
+void OobeUIHTMLSource::StartDataRequest(
+    const std::string& path,
+    bool is_incognito,
+    const content::URLDataSource::GotDataCallback& callback) {
   if (UserManager::Get()->IsUserLoggedIn() &&
       !UserManager::Get()->IsLoggedInAsStub() &&
       !ScreenLocker::default_screen_locker()) {
     scoped_refptr<base::RefCountedBytes> empty_bytes =
         new base::RefCountedBytes();
-    url_data_source()->SendResponse(request_id, empty_bytes);
+    callback.Run(empty_bytes);
     return;
   }
 
   std::string response;
   if (chromeos::KioskModeSettings::Get()->IsKioskModeEnabled())
     response = GetDataResource(IDR_DEMO_USER_LOGIN_HTML);
   else if (path.empty())
     response = GetDataResource(IDR_OOBE_HTML);
   else if (path == kLoginPath)
     response = GetDataResource(IDR_LOGIN_HTML);
   else if (path == kEnterpriseEnrollmentGaiaLoginPath)
     response = GetDataResource(IDR_GAIA_LOGIN_HTML);
 
-  url_data_source()->SendResponse(
-      request_id, base::RefCountedString::TakeString(&response));
+  callback.Run(base::RefCountedString::TakeString(&response));
 }
 
 std::string OobeUIHTMLSource::GetDataResource(int resource_id) const {
   const base::StringPiece html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           resource_id));
   return jstemplate_builder::GetI18nTemplateHtml(html,
                                                  localized_strings_.get());
 }
 
@@ skipping 138 matching lines @@
   // WebUI implementation of the LoginDisplayHost opens HTML page directly,
   // without opening OOBE page.
   NOTREACHED();
   return NULL;
 }
 
 void OobeUI::GetLocalizedStrings(base::DictionaryValue* localized_strings) {
   // Note, handlers_[0] is a GenericHandler used by the WebUI.
   for (size_t i = 0; i < handlers_.size(); ++i)
     handlers_[i]->GetLocalizedStrings(localized_strings);
-  URLDataSource::SetFontAndTextDirection(localized_strings);
+  web_ui_util::SetFontAndTextDirection(localized_strings);
 
 #if defined(GOOGLE_CHROME_BUILD)
   localized_strings->SetString("buildType", "chrome");
 #else
   localized_strings->SetString("buildType", "chromium");
 #endif
 
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableNewOobe))
     localized_strings->SetString("oobeType", "new");
   else
@@ skipping 80 matching lines @@
 void OobeUI::OnCurrentScreenChanged(const std::string& screen) {
   if (screen_ids_.count(screen)) {
     current_screen_ = screen_ids_[screen];
   } else {
     NOTREACHED() << "Screen should be registered in InitializeScreenMaps()";
     current_screen_ = SCREEN_UNKNOWN;
   }
 }
 
 }  // namespace chromeos