WebUI: Fix the remaining references to dom_ui. Final Patch.

BUG=59945, 59946
TEST=trybots

Review URL: http://codereview.chromium.org/6555001

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

27 files changed, 28 insertions, 29 deletions

diff --git a/chrome/browser/browser_signin.h b/chrome/browser/browser_signin.h
index 0da0d07..ab58185 100644
--- a/chrome/browser/browser_signin.h
+++ b/chrome/browser/browser_signin.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -103,8 +103,8 @@ class BrowserSignin : public NotificationObserver {
   // Delegate for the current sign in request.
   SigninDelegate* delegate_;
 
-  // Current HTML Dialog information.  Pointer is owned by the DOM_UI
-  // it will be attached to.
+  // Current HTML Dialog information.  Pointer is owned by the WebUI it will be
+  // attached to.
   BrowserSigninHtml* html_dialog_ui_delegate_;
 
   NotificationRegistrar registrar_;
diff --git a/chrome/browser/chromeos/notifications/balloon_view.cc b/chrome/browser/chromeos/notifications/balloon_view.cc
index 653c6a1..79cdee8 100644
--- a/chrome/browser/chromeos/notifications/balloon_view.cc
+++ b/chrome/browser/chromeos/notifications/balloon_view.cc
@@ -183,7 +183,7 @@ class NotificationControlView : public views::View,
   DISALLOW_COPY_AND_ASSIGN(NotificationControlView);
 };
 
-BalloonViewImpl::BalloonViewImpl(bool sticky, bool controls, bool dom_ui)
+BalloonViewImpl::BalloonViewImpl(bool sticky, bool controls, bool web_ui)
     : balloon_(NULL),
       html_contents_(NULL),
       method_factory_(this),
@@ -191,7 +191,7 @@ BalloonViewImpl::BalloonViewImpl(bool sticky, bool controls, bool dom_ui)
       sticky_(sticky),
       controls_(controls),
       closed_(false),
-      web_ui_(dom_ui) {
+      web_ui_(web_ui) {
   // This object is not to be deleted by the views hierarchy,
   // as it is owned by the balloon.
   set_parent_owned(false);
diff --git a/chrome/browser/chromeos/notifications/balloon_view.h b/chrome/browser/chromeos/notifications/balloon_view.h
index 7f15ea6..f14df82 100644
--- a/chrome/browser/chromeos/notifications/balloon_view.h
+++ b/chrome/browser/chromeos/notifications/balloon_view.h
@@ -42,7 +42,7 @@ class BalloonViewImpl : public BalloonView,
                         public views::View,
                         public NotificationObserver {
  public:
-  BalloonViewImpl(bool sticky, bool controls, bool dom_ui);
+  BalloonViewImpl(bool sticky, bool controls, bool web_ui);
   virtual ~BalloonViewImpl();
 
   // views::View interface.
diff --git a/chrome/browser/chromeos/webui/stats_options_handler.h b/chrome/browser/chromeos/webui/stats_options_handler.h
index b09a5ad..06076bc 100644
--- a/chrome/browser/chromeos/webui/stats_options_handler.h
+++ b/chrome/browser/chromeos/webui/stats_options_handler.h
@@ -15,7 +15,7 @@ class MetricsCrosSettingsProvider;
 // ChromeOS handler for "Stats/crash reporting to Google" option of the Advanced
 // settings page. This handler does only ChromeOS-specific actions while default
 // code is in Chrome's AdvancedOptionsHandler
-// (chrome/browser/dom_ui/advanced_options_handler.cc).
+// (chrome/browser/webui/advanced_options_handler.cc).
 class StatsOptionsHandler : public CrosOptionsPageUIHandler {
  public:
   StatsOptionsHandler();
diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc
index 669ad5c..2da87a6 100644
--- a/chrome/browser/extensions/extension_host.cc
+++ b/chrome/browser/extensions/extension_host.cc
@@ -497,7 +497,7 @@ WebPreferences ExtensionHost::GetWebkitPrefs() {
   Profile* profile = render_view_host()->process()->profile();
   WebPreferences webkit_prefs =
       RenderViewHostDelegateHelper::GetWebkitPrefs(profile,
-                                                   false);  // is_dom_ui
+                                                   false);  // is_web_ui
   // Extensions are trusted so we override any user preferences for disabling
   // javascript or images.
   webkit_prefs.loads_images_automatically = true;
diff --git a/chrome/browser/prerender/prerender_contents.cc b/chrome/browser/prerender/prerender_contents.cc
index 7bf2e3d..7095ecf 100644
--- a/chrome/browser/prerender/prerender_contents.cc
+++ b/chrome/browser/prerender/prerender_contents.cc
@@ -285,7 +285,7 @@ RendererPreferences PrerenderContents::GetRendererPrefs(
 
 WebPreferences PrerenderContents::GetWebkitPrefs() {
   return RenderViewHostDelegateHelper::GetWebkitPrefs(profile_,
-                                                      false);  // is_dom_ui
+                                                      false);  // is_web_ui
 }
 
 void PrerenderContents::ProcessWebUIMessage(
diff --git a/chrome/browser/resources/about_conflicts.html b/chrome/browser/resources/about_conflicts.html
index 9eb6e3a..693d8ce 100644
--- a/chrome/browser/resources/about_conflicts.html
+++ b/chrome/browser/resources/about_conflicts.html
@@ -193,7 +193,7 @@ html[dir=rtl] .clearing {
   }
 
   /**
-  * Called by the dom_ui to re-populate the page with data representing the
+  * Called by the WebUI to re-populate the page with data representing the
   * current state of installed modules.
   */
   function returnModuleList(moduleListData) {
diff --git a/chrome/browser/resources/bug_report.html b/chrome/browser/resources/bug_report.html
index 0afbbe2..f497f94 100644
--- a/chrome/browser/resources/bug_report.html
+++ b/chrome/browser/resources/bug_report.html
@@ -4,7 +4,7 @@
 <meta charset="utf-8"/>

 <title i18n-content="page-title"></title>

 <!-- We want to keep our style in sync with the options page. -->

-<link rel="stylesheet" href="dom_ui.css">
+<link rel="stylesheet" href="webui.css">
 <link rel="stylesheet" href="options/options_page.css">
 <link rel="stylesheet" href="bug_report.css">

 

diff --git a/chrome/browser/resources/extensions_ui.html b/chrome/browser/resources/extensions_ui.html
index 7cebf12..202d186 100644
--- a/chrome/browser/resources/extensions_ui.html
+++ b/chrome/browser/resources/extensions_ui.html
@@ -417,7 +417,7 @@ var extensionDataFormat = {
 var devModeExpanded = false;
 
 /**
- * Toggles the devModeExpanded, and notifies the c++ dom_ui to toggle the
+ * Toggles the devModeExpanded, and notifies the c++ WebUI to toggle the
  * extensions.ui.developer_mode which saved in the preferences.
  */
 function toggleDevModeExpanded() {
diff --git a/chrome/browser/resources/flags.html b/chrome/browser/resources/flags.html
index f47fecd..50941be 100644
--- a/chrome/browser/resources/flags.html
+++ b/chrome/browser/resources/flags.html
@@ -232,7 +232,7 @@ function restartBrowser() {
 }
 
 /**
- * Called by the dom_ui to re-populate the page with data representing the
+ * Called by the WebUI to re-populate the page with data representing the
  * current state of installed experiments.
  */
 function returnFlagsExperiments(flagsExperimentsData){
diff --git a/chrome/browser/resources/gpu_internals.html b/chrome/browser/resources/gpu_internals.html
index 0a39277..bdcea10 100644
--- a/chrome/browser/resources/gpu_internals.html
+++ b/chrome/browser/resources/gpu_internals.html
@@ -6,7 +6,7 @@ Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file.
 -->
 <head i18n-values="dir:textdirection;">
-<link rel="stylesheet" href="dom_ui.css">
+<link rel="stylesheet" href="webui.css">
 <style>
 * {
   box-sizing: border-box;
diff --git a/chrome/browser/resources/history.html b/chrome/browser/resources/history.html
index a6716a6..926560b 100644
--- a/chrome/browser/resources/history.html
+++ b/chrome/browser/resources/history.html
@@ -1050,7 +1050,7 @@ function historyDeleted() {
   historyView.reload();
 }
 </script>
-<link rel="stylesheet" href="dom_ui.css">
+<link rel="stylesheet" href="webui.css">
 <style>
 #results-separator {
   margin-top:12px;
diff --git a/chrome/browser/resources/history2.html b/chrome/browser/resources/history2.html
index 353deb8..ddff0a6 100644
--- a/chrome/browser/resources/history2.html
+++ b/chrome/browser/resources/history2.html
@@ -1082,7 +1082,7 @@ function historyDeleted() {
   historyView.reload();
 }
 </script>
-<link rel="stylesheet" href="dom_ui2.css">
+<link rel="stylesheet" href="webui2.css">
 <style>
 #results-separator {
   margin-top:12px;
diff --git a/chrome/browser/resources/new_new_tab.html b/chrome/browser/resources/new_new_tab.html
index 1148bc7..57aeac1 100644
--- a/chrome/browser/resources/new_new_tab.html
+++ b/chrome/browser/resources/new_new_tab.html
@@ -66,7 +66,7 @@ registerCallback('bookmarkBarAttached');
 
 /**
  * Bitmask for the different UI sections.
- * This matches the Section enum in ../dom_ui/shown_sections_handler.h
+ * This matches the Section enum in ../webui/shown_sections_handler.h
  * @enum {number}
  */
 var Section = {
diff --git a/chrome/browser/resources/options/options.html b/chrome/browser/resources/options/options.html
index 529d4d7..057cc0b 100644
--- a/chrome/browser/resources/options/options.html
+++ b/chrome/browser/resources/options/options.html
@@ -12,7 +12,7 @@
 <link rel="stylesheet" href="chrome://resources/css/list.css">
 <link rel="stylesheet" href="chrome://resources/css/throbber.css">
 <link rel="stylesheet" href="chrome://resources/css/tree.css">
-<link rel="stylesheet" href="../dom_ui.css">
+<link rel="stylesheet" href="../webui.css">
 <link rel="stylesheet" href="options_page.css">
 <link rel="stylesheet" href="add_startup_page_overlay.css">
 <link rel="stylesheet" href="advanced_options.css">
diff --git a/chrome/browser/resources/print_preview.html b/chrome/browser/resources/print_preview.html
index b916331..94da8513c 100644
--- a/chrome/browser/resources/print_preview.html
+++ b/chrome/browser/resources/print_preview.html
@@ -4,7 +4,7 @@
 <meta charset="utf-8">
 <title i18n-content="title"></title>
 
-<link rel="stylesheet" href="dom_ui.css">
+<link rel="stylesheet" href="webui.css">
 <link rel="stylesheet" href="print_preview.css">
 
 <script src="chrome://resources/js/local_strings.js"></script>
diff --git a/chrome/browser/resources/dom_ui.css b/chrome/browser/resources/webui.css
index d1eab85..d1eab85 100644
--- a/chrome/browser/resources/dom_ui.css
+++ b/chrome/browser/resources/webui.css
diff --git a/chrome/browser/resources/dom_ui2.css b/chrome/browser/resources/webui2.css
index 49205f8..49205f8 100644
--- a/chrome/browser/resources/dom_ui2.css
+++ b/chrome/browser/resources/webui2.css
diff --git a/chrome/browser/sync/README.js b/chrome/browser/sync/README.js
index f7ef38e..db12140 100644
--- a/chrome/browser/sync/README.js
+++ b/chrome/browser/sync/README.js
@@ -19,7 +19,7 @@ Message/event flow
 ------------------
 
 chrome://sync-internals is represented by SyncInternalsUI
-(chrome/browser/dom_ui/sync_internals_ui.h).  SyncInternalsUI
+(chrome/browser/web_ui/sync_internals_ui.h).  SyncInternalsUI
 interacts with the sync service via a JsFrontend (js_frontend.h)
 object, which has a ProcessMessage() method.  The JsFrontend can
 handle some messages itself, but it can also delegate the rest to a
diff --git a/chrome/browser/tab_contents/background_contents.cc b/chrome/browser/tab_contents/background_contents.cc
index 059d393..d5e113c 100644
--- a/chrome/browser/tab_contents/background_contents.cc
+++ b/chrome/browser/tab_contents/background_contents.cc
@@ -206,7 +206,7 @@ WebPreferences BackgroundContents::GetWebkitPrefs() {
   // apps.
   Profile* profile = render_view_host_->process()->profile();
   return RenderViewHostDelegateHelper::GetWebkitPrefs(profile,
-                                                      false);  // is_dom_ui
+                                                      false);  // is_web_ui
 }
 
 void BackgroundContents::ProcessWebUIMessage(
diff --git a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
index 34cb45c..1acf625 100644
--- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
+++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
@@ -193,7 +193,7 @@ bool RenderViewHostDelegateHelper::gpu_enabled_ = true;
 
 // static
 WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs(
-    Profile* profile, bool is_dom_ui) {
+    Profile* profile, bool is_web_ui) {
   PrefService* prefs = profile->GetPrefs();
   WebPreferences web_prefs;
 
@@ -332,7 +332,7 @@ WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs(
   }
   DCHECK(!web_prefs.default_encoding.empty());
 
-  if (is_dom_ui) {
+  if (is_web_ui) {
     web_prefs.loads_images_automatically = true;
     web_prefs.javascript_enabled = true;
   }
diff --git a/chrome/browser/tab_contents/render_view_host_delegate_helper.h b/chrome/browser/tab_contents/render_view_host_delegate_helper.h
index 320a3d0..87594f4 100644
--- a/chrome/browser/tab_contents/render_view_host_delegate_helper.h
+++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.h
@@ -95,7 +95,7 @@ class RenderViewHostDelegateViewHelper {
 // RenderViewHostDelegate methods.
 class RenderViewHostDelegateHelper {
  public:
-  static WebPreferences GetWebkitPrefs(Profile* profile, bool is_dom_ui);
+  static WebPreferences GetWebkitPrefs(Profile* profile, bool is_web_ui);
 
   static void UpdateInspectorSetting(Profile* profile,
                                      const std::string& key,
diff --git a/chrome/browser/webui/web_ui_browsertest.cc b/chrome/browser/webui/web_ui_browsertest.cc
index a169fc3..e94c979 100644
--- a/chrome/browser/webui/web_ui_browsertest.cc
+++ b/chrome/browser/webui/web_ui_browsertest.cc
@@ -14,8 +14,7 @@
 
 static const FilePath::CharType* kWebUILibraryJS =
     FILE_PATH_LITERAL("test_api.js");
-static const FilePath::CharType* kWebUITestFolder =
-    FILE_PATH_LITERAL("dom_ui");
+static const FilePath::CharType* kWebUITestFolder = FILE_PATH_LITERAL("webui");
 
 WebUIBrowserTest::~WebUIBrowserTest() {}
 
diff --git a/chrome/browser/webui/web_ui_browsertest.h b/chrome/browser/webui/web_ui_browsertest.h
index 4332a27..7422472 100644
--- a/chrome/browser/webui/web_ui_browsertest.h
+++ b/chrome/browser/webui/web_ui_browsertest.h
@@ -15,10 +15,10 @@
 class WebUIMessageHandler;
 
 // The runner of WebUI javascript based tests.
-// See chrome/test/data/dom_ui/test_api.js for the javascript side test API's.
+// See chrome/test/data/webui/test_api.js for the javascript side test API's.
 //
 // These tests should follow the form given in:
-// chrome/test/data/dom_ui/sample_downloads.js.
+// chrome/test/data/webui/sample_downloads.js.
 // and the lone test within this class.
 class WebUIBrowserTest : public InProcessBrowserTest {
  public:
@@ -51,7 +51,7 @@ class WebUIBrowserTest : public InProcessBrowserTest {
   // Handles test framework messages.
   scoped_ptr<WebUIHandlerBrowserTest> test_handler_;
 
-  // Location of test data (currently test/data/dom_ui).
+  // Location of test data (currently test/data/webui).
   FilePath test_data_directory_;
 };
 
diff --git a/chrome/test/data/dom_ui/sample_downloads.js b/chrome/test/data/webui/sample_downloads.js
index 68ac9c0..68ac9c0 100644
--- a/chrome/test/data/dom_ui/sample_downloads.js
+++ b/chrome/test/data/webui/sample_downloads.js
diff --git a/chrome/test/data/dom_ui/settings_set_boolean_pref_triggers.js b/chrome/test/data/webui/settings_set_boolean_pref_triggers.js
index c3d1d6d..c3d1d6d 100644
--- a/chrome/test/data/dom_ui/settings_set_boolean_pref_triggers.js
+++ b/chrome/test/data/webui/settings_set_boolean_pref_triggers.js
diff --git a/chrome/test/data/dom_ui/test_api.js b/chrome/test/data/webui/test_api.js
index 08140d0..08140d0 100644
--- a/chrome/test/data/dom_ui/test_api.js
+++ b/chrome/test/data/webui/test_api.js