Refactor the about:version code out of about_ui.

chrome/browser/ui/webui/about_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/about_ui.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/i18n/number_formatting.h"
 #include "base/json/json_writer.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/singleton.h"
-#include "base/metrics/field_trial.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/metrics/stats_table.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/string_piece.h"
-#include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/browser_about_handler.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/memory_details.h"
 #include "chrome/browser/net/predictor.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/plugin_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/net/gaia/google_service_auth_error.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
-#include "content/public/browser/web_ui.h"
-#include "content/public/browser/web_ui_message_handler.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/process_type.h"
 #include "googleurl/src/gurl.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "net/base/escape.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "v8/include/v8.h"
 #include "webkit/glue/user_agent.h"
-#include "webkit/glue/webkit_glue.h"
 #include "webkit/plugins/webplugininfo.h"
 
 #if defined(ENABLE_THEMES)
 #include "chrome/browser/ui/webui/theme_source.h"
 #endif
 
 #if defined(OS_LINUX) || defined(OS_OPENBSD)
 #include "content/public/browser/zygote_host_linux.h"
 #include "content/public/common/sandbox_linux.h"
 #endif
@@ skipping 1039 matching lines @@
   return data;
 }
 
 // Used as a callback for PluginService::GetPlugins().
 void HandleAboutVersionStrings(AboutUIHTMLSource* source,
                                int request_id,
                                const std::vector<webkit::WebPluginInfo>&) {
 #if defined(OS_CHROMEOS)
   new ChromeOSAboutVersionHandler(source, request_id);
 #else
-  DictionaryValue localized_strings;
-  localized_strings.SetString("os_version", "");
-  source->FinishDataRequest(
-      AboutVersionStrings(&localized_strings, source->profile()),
-      request_id);
+  // All other platforms are handled by VersionUI.
 #endif
 }
 
 // AboutMemoryHandler ----------------------------------------------------------
 
 // Helper for AboutMemory to bind results from a ProcessMetrics object
 // to a DictionaryValue. Fills ws_usage and comm_usage so that the objects
 // can be used in caller's scope (e.g for appending to a net total).
 void AboutMemoryHandler::BindProcessMetrics(DictionaryValue* data,
                                             ProcessMemoryInformation* info) {
@@ skipping 142 matching lines @@
   source_->FinishDataRequest(AboutVersionStrings(
       &localized_strings, source_->profile()), request_id_);
 
   // CancelableRequestProvider isn't happy when it's deleted and servicing a
   // task, so we delay the deletion.
   MessageLoop::current()->DeleteSoon(FROM_HERE, this);
 }
 
 #endif
 
-class VersionDOMHandler : public content::WebUIMessageHandler {
- public:
-  VersionDOMHandler();
-  virtual ~VersionDOMHandler();
-
-  // content::WebUIMessageHandler implementation.
-  virtual void RegisterMessages() OVERRIDE;
-
-  // Callback for the "requestVariationsList" message. This requests the list of
-  // variations from the client and sends it to the frontend.
-  void HandleRequestVariationsList(const ListValue* args);
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(VersionDOMHandler);
-};
-
-VersionDOMHandler::VersionDOMHandler() {
-}
-
-VersionDOMHandler::~VersionDOMHandler() {
-}
-
-void VersionDOMHandler::RegisterMessages() {
-  web_ui()->RegisterMessageCallback(
-      "requestVariationsList",
-      base::Bind(&VersionDOMHandler::HandleRequestVariationsList,
-      base::Unretained(this)));
-}
-
-void VersionDOMHandler::HandleRequestVariationsList(const ListValue* args) {
-  scoped_ptr<ListValue> variations_list(new ListValue());
-#if !defined(NDEBUG)
-  std::vector<std::string> variations;
-  std::string variation_state;
-  base::FieldTrialList::StatesToString(&variation_state);
-
-  std::vector<std::string> tokens;
-  base::SplitString(variation_state,
-                    base::FieldTrialList::kPersistentStringSeparator,
-                    &tokens);
-  // Since StatesToString appends a separator at the end, SplitString will
-  // append an extra empty string in the vector. Drop it. There should
-  // always be an even number of tokens left.
-  tokens.pop_back();
-  DCHECK_EQ(0U, tokens.size() % 2);
-  for (size_t i = 0; i < tokens.size(); i += 2)
-    variations.push_back(tokens[i] + ":" + tokens[i + 1]);
-
-  for (std::vector<std::string>::const_iterator it = variations.begin();
-      it != variations.end(); ++it) {
-    variations_list->Append(Value::CreateStringValue(*it));
-  }
-#endif
-  // In release mode, this will return an empty list to clear the section.
-  web_ui()->CallJavascriptFunction("returnVariationsList",
-                                   *variations_list.release());
-}
-
 }  // namespace
 
 // AboutUIHTMLSource ----------------------------------------------------------
 
 AboutUIHTMLSource::AboutUIHTMLSource(const std::string& source_name,
                                      Profile* profile)
     : DataSource(source_name, MessageLoop::current()),
       profile_(profile) {
 }
 
@@ skipping 50 matching lines @@
     ChromeOSTermsHandler::Start(this, path, request_id);
     return;
 #else
     response = l10n_util::GetStringUTF8(IDS_TERMS_HTML);
 #endif
   } else if (host == chrome::kChromeUIVersionHost) {
     if (path == kStringsJsPath) {
       // The Flash version information is needed on this page, so make sure
       // the plugins are loaded.
       PluginService::GetInstance()->GetPlugins(
           base::Bind(&HandleAboutVersionStrings,

[SteveT, 2012/09/10 15:40:00]

I just realized that this bit here that handles about:version's strings.js needs
to wait for Plugins to load before it can call the rest of the code that builds
the strings.js contents. Currently in my refactor, we don't handle this... The
ChromeWebUIDataSource approach seems to need to run synchronously when
strings.js is requested (I can't dispatch a call and get called back later when
the data is ready).

Should I follow the same suggestion you had before for CrOS version? Don't
populate the Flash version until it's ready.. and when it is, populate it with
CallJavascriptFunction?

[Evan Stade, 2012/09/10 17:07:23]

that's not true. Look at favicon_source; that loads favicons asynchronously.
yes, I think that's the easiest way.

                      make_scoped_refptr(this), request_id));
       return;
     } else {
       response = AboutVersionStaticContent(path);
     }
   }
 
   FinishDataRequest(response, request_id);
 }
 
@@ skipping 17 matching lines @@
 AboutUI::AboutUI(content::WebUI* web_ui, const std::string& name)
     : WebUIController(web_ui) {
   Profile* profile = Profile::FromWebUI(web_ui);
 
 #if defined(ENABLE_THEMES)
   // Set up the chrome://theme/ source.
   ThemeSource* theme = new ThemeSource(profile);
   ChromeURLDataManager::AddDataSource(profile, theme);
 #endif
 
-  web_ui->AddMessageHandler(new VersionDOMHandler());
-
   ChromeURLDataManager::DataSource* source =
       new AboutUIHTMLSource(name, profile);
   if (source) {
     ChromeURLDataManager::AddDataSource(profile, source);
   }
 }