Add --use-more-webui runtime flag to toggle WebUI replacements for native dialogs.

chrome/browser/browser_main.cc

 // Copyright (c) 2011 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/browser_main.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 59 matching lines @@
 #include "chrome/browser/search_engines/search_engine_type.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/service/service_process_control.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/translate/translate_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_init.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h"
+#include "chrome/browser/ui/webui/chrome_web_ui.h"
 #include "chrome/browser/web_resource/gpu_blacklist_updater.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_result_codes.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/env_vars.h"
 #include "chrome/common/json_pref_store.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/logging_chrome.h"
@@ skipping 1400 matching lines @@
     // We don't support retention experiments on Mac or Linux.
     return content::RESULT_CODE_NORMAL_EXIT;
 #endif  // defined(OS_WIN)
   }
 
 #if defined(OS_CHROMEOS)
   // This needs to be called after the locale has been set.
   RegisterTranslateableItems();
 #endif
 
+  ChromeWebUI::SetMoreWebUI(

[Rick Byers, 2011/08/18 19:25:30]

Rather that keep a separate flag which you set at startup, you could just have a
getter that computes the value on demand.  I'm not sure which approach is more
common, but that's what the NTP4 code does, see NewTabUI::NTP4Enabled().  This
startup function is long enough that avoiding adding any code to it might be
nice.  But again, assuming lookup is fast either way, I'd go with whichever
style is more common for runtime flags...

[flackr, 2011/08/23 17:41:44]

Done.

+      CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseMoreWebUI));
+
 #if defined(TOOLKIT_VIEWS)
   views::Widget::SetPureViews(
       CommandLine::ForCurrentProcess()->HasSwitch(switches::kUsePureViews));
+  // If using Pure Views, turn on More WebUI to remove as much GTK as possible.
+  if (views::Widget::IsPureViews()) {
+    ChromeWebUI::SetMoreWebUI(true);
+  }
   // Launch the views desktop shell window and register it as the default parent
   // for all unparented views widgets.
   if (parsed_command_line.HasSwitch(switches::kViewsDesktop)) {
     std::string desktop_type_cmd =
         parsed_command_line.GetSwitchValueASCII(switches::kViewsDesktop);
     views::desktop::DesktopWindowView::DesktopType desktop_type;
     if (desktop_type_cmd == "netbook")
       desktop_type = views::desktop::DesktopWindowView::DESKTOP_NETBOOK;
     else if (desktop_type_cmd == "other")
       desktop_type = views::desktop::DesktopWindowView::DESKTOP_OTHER;
@@ skipping 657 matching lines @@
   // (environment variable is set, and valid).
   std::string pre_read;
   if (env->GetVar(kEnvVar, &pre_read) && (pre_read == "0" || pre_read == "1")) {
     std::string uma_name(name);
     uma_name += "_PreRead";
     uma_name += pre_read == "1" ? "Enabled" : "Disabled";
     AddPreReadHistogramTime(uma_name.c_str(), time);
   }
 #endif
 }