WebUI: Change all references from "DOM UI" to "Web UI".

BUG=59945
TEST=trybots

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

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

35 files changed, 87 insertions, 87 deletions

diff --git a/chrome/app/resources/locale_settings_cros.grd b/chrome/app/resources/locale_settings_cros.grd
index c2709ac..c889b29 100644
--- a/chrome/app/resources/locale_settings_cros.grd
+++ b/chrome/app/resources/locale_settings_cros.grd
@@ -132,12 +132,12 @@
   </translations>
   <release seq="1" allow_pseudo="false">
     <messages fallback_to_english="true">
-      <!-- The font used in DOM UI (e.g. History). -->
+      <!-- The font used in Web UI (e.g. History). -->
       <message name="IDS_WEB_FONT_FAMILY" use_name_for_id="true">
         Chrome Droid Sans,Droid Sans Fallback,sans-serif
       </message>
 
-      <!-- The relative font size in % used in DOM UI (e.g. History).  -->
+      <!-- The relative font size in % used in Web UI (e.g. History).  -->
       <message name="IDS_WEB_FONT_SIZE" use_name_for_id="true">
         84%
       </message>
diff --git a/chrome/app/resources/locale_settings_linux.grd b/chrome/app/resources/locale_settings_linux.grd
index 7abf8f4..7eb1589 100644
--- a/chrome/app/resources/locale_settings_linux.grd
+++ b/chrome/app/resources/locale_settings_linux.grd
@@ -132,12 +132,12 @@
   </translations>
   <release seq="1" allow_pseudo="false">
     <messages fallback_to_english="true">
-      <!-- The font used in DOM UI (e.g. History). -->
+      <!-- The font used in Web UI (e.g. History). -->
       <message name="IDS_WEB_FONT_FAMILY" use_name_for_id="true">
         Arial, sans-serif
       </message>
 
-      <!-- The relative font size in % used in DOM UI (e.g. History).  -->
+      <!-- The relative font size in % used in Web UI (e.g. History).  -->
       <message name="IDS_WEB_FONT_SIZE" use_name_for_id="true">
         84%
       </message>
diff --git a/chrome/app/resources/locale_settings_mac.grd b/chrome/app/resources/locale_settings_mac.grd
index 335b48f..c7e816d 100644
--- a/chrome/app/resources/locale_settings_mac.grd
+++ b/chrome/app/resources/locale_settings_mac.grd
@@ -114,12 +114,12 @@
   </translations>
   <release seq="1" allow_pseudo="false">
     <messages fallback_to_english="true">
-      <!-- The font used in DOM UI (e.g. History). -->
+      <!-- The font used in Web UI (e.g. History). -->
       <message name="IDS_WEB_FONT_FAMILY" use_name_for_id="true">
         Helvetica, sans-serif
       </message>
 
-      <!-- The relative font size in % used in DOM UI (e.g. History).  -->
+      <!-- The relative font size in % used in Web UI (e.g. History).  -->
       <message name="IDS_WEB_FONT_SIZE" use_name_for_id="true">
         84%
       </message>
diff --git a/chrome/app/resources/locale_settings_win.grd b/chrome/app/resources/locale_settings_win.grd
index ed502bd..4415997 100644
--- a/chrome/app/resources/locale_settings_win.grd
+++ b/chrome/app/resources/locale_settings_win.grd
@@ -114,12 +114,12 @@
   </translations>
   <release seq="1" allow_pseudo="false">
     <messages fallback_to_english="true">
-      <!-- The font used in DOM UI (e.g. History). -->
+      <!-- The font used in Web UI (e.g. History). -->
       <message name="IDS_WEB_FONT_FAMILY" use_name_for_id="true">
         Arial, sans-serif
       </message>
 
-      <!-- The relative font size in % used in DOM UI (e.g. History).  -->
+      <!-- The relative font size in % used in Web UI (e.g. History).  -->
       <message name="IDS_WEB_FONT_SIZE" use_name_for_id="true">
         84%
       </message>
diff --git a/chrome/browser/browser_url_handler.cc b/chrome/browser/browser_url_handler.cc
index 806f1bd..211d168 100644
--- a/chrome/browser/browser_url_handler.cc
+++ b/chrome/browser/browser_url_handler.cc
@@ -59,7 +59,7 @@ static bool ReverseViewSource(GURL* url, Profile* profile) {
   return true;
 }
 
-// Handles rewriting DOM UI URLs.
+// Handles rewriting Web UI URLs.
 static bool HandleDOMUI(GURL* url, Profile* profile) {
   if (!WebUIFactory::UseWebUIForURL(profile, *url))
     return false;
diff --git a/chrome/browser/child_process_security_policy.cc b/chrome/browser/child_process_security_policy.cc
index 0ea3e1d..5b309ba 100644
--- a/chrome/browser/child_process_security_policy.cc
+++ b/chrome/browser/child_process_security_policy.cc
@@ -282,10 +282,10 @@ void ChildProcessSecurityPolicy::GrantDOMUIBindings(int child_id) {
 
   state->second->GrantBindings(BindingsPolicy::DOM_UI);
 
-  // DOM UI bindings need the ability to request chrome: URLs.
+  // Web UI bindings need the ability to request chrome: URLs.
   state->second->GrantScheme(chrome::kChromeUIScheme);
 
-  // DOM UI pages can contain links to file:// URLs.
+  // Web UI pages can contain links to file:// URLs.
   state->second->GrantScheme(chrome::kFileScheme);
 }
 
diff --git a/chrome/browser/child_process_security_policy.h b/chrome/browser/child_process_security_policy.h
index dd2244d..5dbd6ee 100644
--- a/chrome/browser/child_process_security_policy.h
+++ b/chrome/browser/child_process_security_policy.h
@@ -84,7 +84,7 @@ class ChildProcessSecurityPolicy {
   // scheme.
   void GrantScheme(int child_id, const std::string& scheme);
 
-  // Grant the child process the ability to use DOM UI Bindings.
+  // Grant the child process the ability to use Web UI Bindings.
   void GrantDOMUIBindings(int child_id);
 
   // Grant the child process the ability to use extension Bindings.
diff --git a/chrome/browser/chromeos/dom_ui/menu_ui.cc b/chrome/browser/chromeos/dom_ui/menu_ui.cc
index 915e15c..a12c8c3 100644
--- a/chrome/browser/chromeos/dom_ui/menu_ui.cc
+++ b/chrome/browser/chromeos/dom_ui/menu_ui.cc
@@ -608,7 +608,7 @@ DictionaryValue* MenuUI::CreateMenuItem(const ui::MenuModel* model,
                                         const char* type,
                                         int* max_icon_width,
                                         bool* has_accel) const {
-  // Note: DOM UI uses '&' as mnemonic.
+  // Note: Web UI uses '&' as mnemonic.
   string16 label16 = model->GetLabelAt(index);
   DictionaryValue* item = new DictionaryValue();
 
diff --git a/chrome/browser/chromeos/dom_ui/mobile_setup_ui.cc b/chrome/browser/chromeos/dom_ui/mobile_setup_ui.cc
index 7a8835a..bb03092 100644
--- a/chrome/browser/chromeos/dom_ui/mobile_setup_ui.cc
+++ b/chrome/browser/chromeos/dom_ui/mobile_setup_ui.cc
@@ -285,7 +285,7 @@ class MobileSetupHandler
 
   // Performs activation state cellular device evaluation.
   // Returns false if device activation failed. In this case |error|
-  // will contain error message to be reported to DOM UI.
+  // will contain error message to be reported to Web UI.
   static bool EvaluateCellularDeviceState(bool* report_status,
                                           std::string* state,
                                           std::string* error);
diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc
index 85a0620..0cb7e1a 100644
--- a/chrome/browser/chromeos/login/existing_user_controller.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller.cc
@@ -488,7 +488,7 @@ void ExistingUserController::ActivateWizard(const std::string& screen_name) {
 
 LoginDisplay* ExistingUserController::CreateLoginDisplay(
     LoginDisplay::Delegate* delegate, const gfx::Rect& background_bounds) {
-  // TODO(rharrison): Create DOM UI implementation too. http://crosbug.com/6398.
+  // TODO(rharrison): Create Web UI implementation too. http://crosbug.com/6398.
   return new ViewsLoginDisplay(delegate, background_bounds);
 }
 
diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc
index b74f413..01ee841 100644
--- a/chrome/browser/chromeos/status/network_menu.cc
+++ b/chrome/browser/chromeos/status/network_menu.cc
@@ -217,7 +217,7 @@ bool NetworkMenu::ConnectToNetworkAt(int index,
       }
       if (!connected) {
         if (!MenuUI::IsEnabled()) {
-          // Show the wifi dialog on a failed attempt for non DOM UI menus.
+          // Show the wifi dialog on a failed attempt for non Web UI menus.
           ShowNetworkConfigView(new NetworkConfigView(wifi));
           return true;
         } else {
diff --git a/chrome/browser/chromeos/status/network_menu.h b/chrome/browser/chromeos/status/network_menu.h
index a4b213d..5c88c8e 100644
--- a/chrome/browser/chromeos/status/network_menu.h
+++ b/chrome/browser/chromeos/status/network_menu.h
@@ -188,7 +188,7 @@ class NetworkMenu : public views::ViewMenuDelegate,
   // Called by RunMenu to initialize our list of menu items.
   void InitMenuItems();
 
-  // Shows network details in DOM UI options window.
+  // Shows network details in Web UI options window.
   void ShowTabbedNetworkSettings(const Network* network) const;
 
   // Show a NetworkConfigView modal dialog instance.
diff --git a/chrome/browser/dom_ui/app_launcher_handler.h b/chrome/browser/dom_ui/app_launcher_handler.h
index 69318d826..233a394 100644
--- a/chrome/browser/dom_ui/app_launcher_handler.h
+++ b/chrome/browser/dom_ui/app_launcher_handler.h
@@ -102,7 +102,7 @@ class AppLauncherHandler
   // when necessary.
   NotificationRegistrar registrar_;
 
-  // Monitor extension preference changes so that the DOM UI can be notified.
+  // Monitor extension preference changes so that the Web UI can be notified.
   PrefChangeRegistrar pref_change_registrar_;
 
   // Used to show confirmation UI for uninstalling/enabling extensions in
diff --git a/chrome/browser/dom_ui/conflicts_ui.h b/chrome/browser/dom_ui/conflicts_ui.h
index d683a9c..5b4dbcd 100644
--- a/chrome/browser/dom_ui/conflicts_ui.h
+++ b/chrome/browser/dom_ui/conflicts_ui.h
@@ -12,7 +12,7 @@
 
 class RefCountedMemory;
 
-// The DOM UI handler for about:conflicts.
+// The Web UI handler for about:conflicts.
 class ConflictsUI : public DOMUI {
  public:
   explicit ConflictsUI(TabContents* contents);
diff --git a/chrome/browser/dom_ui/dom_ui.h b/chrome/browser/dom_ui/dom_ui.h
index 67932ef..6ecd311 100644
--- a/chrome/browser/dom_ui/dom_ui.h
+++ b/chrome/browser/dom_ui/dom_ui.h
@@ -82,13 +82,13 @@ class DOMUI {
     return focus_location_bar_by_default_;
   }
 
-  // Returns true if the page's URL should be hidden. Some DOM UI pages
+  // Returns true if the page's URL should be hidden. Some Web UI pages
   // like the new tab page will want to hide it.
   bool should_hide_url() const {
     return should_hide_url_;
   }
 
-  // Gets a custom tab title provided by the DOM UI. If there is no title
+  // Gets a custom tab title provided by the Web UI. If there is no title
   // override, the string will be empty which should trigger the default title
   // behavior for the tab.
   const string16& overridden_title() const {
@@ -96,7 +96,7 @@ class DOMUI {
   }
 
   // Returns the transition type that should be used for link clicks on this
-  // DOM UI. This will default to LINK but may be overridden.
+  // Web UI. This will default to LINK but may be overridden.
   PageTransition::Type link_transition_type() const {
     return link_transition_type_;
   }
@@ -145,7 +145,7 @@ class DOMUI {
   // testing purposes.
   virtual void ExecuteJavascript(const std::wstring& javascript);
 
-  // Options that may be overridden by individual DOM UI implementations. The
+  // Options that may be overridden by individual Web UI implementations. The
   // bool options default to false. See the public getters for more information.
   bool hide_favicon_;
   bool force_bookmark_bar_visible_;
diff --git a/chrome/browser/dom_ui/dom_ui_unittest.cc b/chrome/browser/dom_ui/dom_ui_unittest.cc
index f3b6b72..d0c849a 100644
--- a/chrome/browser/dom_ui/dom_ui_unittest.cc
+++ b/chrome/browser/dom_ui/dom_ui_unittest.cc
@@ -16,7 +16,7 @@ class DOMUITest : public RenderViewHostTestHarness {
  public:
   DOMUITest() : ui_thread_(BrowserThread::UI, MessageLoop::current()) {}
 
-  // Tests navigating with a DOM UI from a fresh (nothing pending or committed)
+  // Tests navigating with a Web UI from a fresh (nothing pending or committed)
   // state, through pending, committed, then another navigation. The first page
   // ID that we should use is passed as a parameter. We'll use the next two
   // values. This must be increasing for the life of the tests.
@@ -31,7 +31,7 @@ class DOMUITest : public RenderViewHostTestHarness {
     ASSERT_TRUE(controller->pending_entry());
     ASSERT_FALSE(controller->GetLastCommittedEntry());
 
-    // Check the things the pending DOM UI should have set.
+    // Check the things the pending Web UI should have set.
     EXPECT_FALSE(contents->ShouldDisplayURL());
     EXPECT_FALSE(contents->ShouldDisplayFavIcon());
     EXPECT_TRUE(contents->ShouldShowBookmarkBar());
@@ -86,7 +86,7 @@ class DOMUITest : public RenderViewHostTestHarness {
 };
 
 // Tests that the New Tab Page flags are correctly set and propogated by
-// TabContents when we first navigate to a DOM UI page, then to a standard
+// TabContents when we first navigate to a Web UI page, then to a standard
 // non-DOM-UI page.
 TEST_F(DOMUITest, DOMUIToStandard) {
   DoNavigationTest(contents(), 1);
@@ -144,7 +144,7 @@ TEST_F(DOMUITest, StandardToDOMUI) {
   EXPECT_FALSE(contents()->ShouldShowBookmarkBar());
   EXPECT_TRUE(contents()->FocusLocationBarByDefault());
 
-  // Committing DOM UI is tested above.
+  // Committing Web UI is tested above.
 }
 
 class TabContentsForFocusTest : public TestTabContents {
diff --git a/chrome/browser/dom_ui/html_dialog_ui.cc b/chrome/browser/dom_ui/html_dialog_ui.cc
index d6c1d54..c52349d2 100644
--- a/chrome/browser/dom_ui/html_dialog_ui.cc
+++ b/chrome/browser/dom_ui/html_dialog_ui.cc
@@ -73,7 +73,7 @@ void HtmlDialogUI::OnDialogClosed(const ListValue* args) {
 
 ExternalHtmlDialogUI::ExternalHtmlDialogUI(TabContents* tab_contents)
     : HtmlDialogUI(tab_contents) {
-  // Non-file based UI needs to not have access to the DOM UI bindings
+  // Non-file based UI needs to not have access to the Web UI bindings
   // for security reasons. The code hosting the dialog should provide
   // dialog specific functionality through other bindings and methods
   // that are scoped in duration to the dialogs existence.
diff --git a/chrome/browser/dom_ui/html_dialog_ui.h b/chrome/browser/dom_ui/html_dialog_ui.h
index 5cd9eed..d889c1b 100644
--- a/chrome/browser/dom_ui/html_dialog_ui.h
+++ b/chrome/browser/dom_ui/html_dialog_ui.h
@@ -73,7 +73,7 @@ class HtmlDialogUIDelegate {
 // Before loading a URL corresponding to this DOMUI, the caller should set its
 // delegate as a property on the TabContents. This DOMUI will pick it up from
 // there and call it back. This is a bit of a hack to allow the dialog to pass
-// its delegate to the DOM UI without having nasty accessors on the TabContents.
+// its delegate to the Web UI without having nasty accessors on the TabContents.
 // The correct design using RVH directly would avoid all of this.
 class HtmlDialogUI : public DOMUI {
  public:
diff --git a/chrome/browser/dom_ui/net_internals_ui.cc b/chrome/browser/dom_ui/net_internals_ui.cc
index 856c2b7..70f9d03 100644
--- a/chrome/browser/dom_ui/net_internals_ui.cc
+++ b/chrome/browser/dom_ui/net_internals_ui.cc
@@ -312,8 +312,8 @@ class NetInternalsMessageHandler::IOThreadImpl
   // Helper that runs the suite of connection tests.
   scoped_ptr<ConnectionTester> connection_tester_;
 
-  // True if the DOM UI has been deleted.  This is used to prevent calling
-  // Javascript functions after the DOM UI is destroyed.  On refresh, the
+  // True if the Web UI has been deleted.  This is used to prevent calling
+  // Javascript functions after the Web UI is destroyed.  On refresh, the
   // messages can end up being sent to the refreshed page, causing duplicate
   // or partial entries.
   //
diff --git a/chrome/browser/dom_ui/new_tab_ui.cc b/chrome/browser/dom_ui/new_tab_ui.cc
index 6fc47a2..224d836 100644
--- a/chrome/browser/dom_ui/new_tab_ui.cc
+++ b/chrome/browser/dom_ui/new_tab_ui.cc
@@ -285,7 +285,7 @@ void NewTabPageClosePromoHandler::HandleClosePromo(
 
 NewTabUI::NewTabUI(TabContents* contents)
     : DOMUI(contents) {
-  // Override some options on the DOM UI.
+  // Override some options on the Web UI.
   hide_favicon_ = true;
   force_bookmark_bar_visible_ = true;
   focus_location_bar_by_default_ = true;
diff --git a/chrome/browser/dom_ui/print_preview_handler.h b/chrome/browser/dom_ui/print_preview_handler.h
index b5d454d..72d10b3 100644
--- a/chrome/browser/dom_ui/print_preview_handler.h
+++ b/chrome/browser/dom_ui/print_preview_handler.h
@@ -28,7 +28,7 @@ class PrintPreviewHandler : public DOMMessageHandler,
   // Get the PDF preview and refresh the PDF plugin. |args| is unused.
   void HandleGetPreview(const ListValue* args);
 
-  // Get the list of printers and send it to the DOM UI. |args| is unused.
+  // Get the list of printers and send it to the Web UI. |args| is unused.
   void HandleGetPrinters(const ListValue* args);
 
   // Pointer to current print system.
diff --git a/chrome/browser/dom_ui/web_ui_factory.cc b/chrome/browser/dom_ui/web_ui_factory.cc
index d233778..d6a6d86 100644
--- a/chrome/browser/dom_ui/web_ui_factory.cc
+++ b/chrome/browser/dom_ui/web_ui_factory.cc
@@ -127,11 +127,11 @@ static WebUIFactoryFunction GetWebUIFactoryFunction(Profile* profile,
       url.SchemeIs(chrome::kChromeInternalScheme))
     return &NewDOMUI<NewTabUI>;
 
-  // Give about:about a generic DOM UI so it can navigate to pages with DOM UIs.
+  // Give about:about a generic Web UI so it can navigate to pages with Web UIs.
   if (url.spec() == chrome::kChromeUIAboutAboutURL)
     return &NewDOMUI<DOMUI>;
 
-  // We must compare hosts only since some of the DOM UIs append extra stuff
+  // We must compare hosts only since some of the Web UIs append extra stuff
   // after the host name.
   if (url.host() == chrome::kChromeUIBookmarksHost)
     return &NewDOMUI<BookmarksUI>;
@@ -246,9 +246,9 @@ bool WebUIFactory::UseWebUIForURL(Profile* profile, const GURL& url) {
 // static
 bool WebUIFactory::IsURLAcceptableForWebUI(Profile* profile, const GURL& url) {
   return UseWebUIForURL(profile, url) ||
-      // javacsript: URLs are allowed to run in DOM UI pages
+      // javacsript: URLs are allowed to run in Web UI pages
       url.SchemeIs(chrome::kJavaScriptScheme) ||
-      // It's possible to load about:blank in a DOM UI renderer.
+      // It's possible to load about:blank in a Web UI renderer.
       // See http://crbug.com/42547
       url.spec() == chrome::kAboutBlankURL ||
       // about:crash, about:kill, about:hang, and about:shorthang are allowed.
diff --git a/chrome/browser/dom_ui/web_ui_factory.h b/chrome/browser/dom_ui/web_ui_factory.h
index cb36109..bdee4a7 100644
--- a/chrome/browser/dom_ui/web_ui_factory.h
+++ b/chrome/browser/dom_ui/web_ui_factory.h
@@ -22,30 +22,30 @@ typedef void* WebUITypeID;
 class WebUIFactory {
  public:
   // A special DOMUI type that signifies that a given page would not use the
-  // DOM UI system.
+  // Web UI system.
   static const WebUITypeID kNoWebUI;
 
   // Returns a type identifier indicating what DOMUI we would use for the
   // given URL. This is useful for comparing the potential DOMUIs for two URLs.
-  // Returns kNoWebUI if the given URL will not use the DOM UI system.
+  // Returns kNoWebUI if the given URL will not use the Web UI system.
   static WebUITypeID GetWebUIType(Profile* profile, const GURL& url);
 
-  // Returns true if the given URL's scheme would trigger the DOM UI system.
+  // Returns true if the given URL's scheme would trigger the Web UI system.
   // This is a less precise test than UseDONUIForURL, which tells you whether
   // that specific URL matches a known one. This one is faster and can be used
   // to determine security policy.
   static bool HasWebUIScheme(const GURL& url);
 
-  // Returns true if the given URL must use the DOM UI system.
+  // Returns true if the given URL must use the Web UI system.
   static bool UseWebUIForURL(Profile* profile, const GURL& url);
 
-  // Returns true if the given URL can be loaded by DOM UI system.  This
+  // Returns true if the given URL can be loaded by Web UI system.  This
   // includes URLs that can be loaded by normal tabs as well, such as
   // javascript: URLs or about:hang.
   static bool IsURLAcceptableForWebUI(Profile* profile, const GURL& url);
 
   // Allocates a new DOMUI object for the given URL, and returns it. If the URL
-  // is not a DOM UI URL, then it will return NULL. When non-NULL, ownership of
+  // is not a Web UI URL, then it will return NULL. When non-NULL, ownership of
   // the returned pointer is passed to the caller.
   static DOMUI* CreateWebUIForURL(TabContents* tab_contents, const GURL& url);
 
diff --git a/chrome/browser/notifications/balloon_host.h b/chrome/browser/notifications/balloon_host.h
index 99a6c0a..fc576c4 100644
--- a/chrome/browser/notifications/balloon_host.h
+++ b/chrome/browser/notifications/balloon_host.h
@@ -112,7 +112,7 @@ class BalloonHost : public RenderViewHostDelegate,
   virtual void UpdatePreferredSize(const gfx::Size& pref_size);
   virtual RendererPreferences GetRendererPrefs(Profile* profile) const;
 
-  // Enable DOM UI. This has to be called before renderer is created.
+  // Enable Web UI. This has to be called before renderer is created.
   void EnableDOMUI();
 
   virtual void UpdateInspectorSetting(const std::string& key,
@@ -154,7 +154,7 @@ class BalloonHost : public RenderViewHostDelegate,
   // rendering a page from an extension.
   scoped_ptr<ExtensionFunctionDispatcher> extension_function_dispatcher_;
 
-  // A flag to enable DOM UI.
+  // A flag to enable Web UI.
   bool enable_dom_ui_;
 
   NotificationRegistrar registrar_;
diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc
index 61f2288..78061eb 100644
--- a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc
+++ b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc
@@ -230,7 +230,7 @@ void CloudPrintSetupFlow::OnUserClickedPrintTestPage() {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-// Helper methods for showing contents of the DOM UI
+// Helper methods for showing contents of the Web UI
 void CloudPrintSetupFlow::ShowGaiaLogin(const DictionaryValue& args) {
   if (dom_ui_)
     dom_ui_->CallJavascriptFunction(L"cloudprint.showSetupLogin");
diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.h b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.h
index 02be7f1..d63f9c7 100644
--- a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.h
+++ b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.h
@@ -31,7 +31,7 @@ class Browser;
 // 1. Showing the setup dialog.
 // 2. Providing the URL for the content of the dialog.
 // 3. Providing a data source to provide the content HTML files.
-// 4. Providing a message handler to handle user actions in the DOM UI.
+// 4. Providing a message handler to handle user actions in the Web UI.
 // 5. Responding to actions received in the message handler.
 //
 // The architecture for DOMUI is designed such that only the message handler
@@ -110,7 +110,7 @@ class CloudPrintSetupFlow : public HtmlDialogUIDelegate,
   void ExecuteJavascriptInIFrame(const std::wstring& iframe_xpath,
                                  const std::wstring& js);
 
-  // Pointer to the DOM UI. This is provided by CloudPrintSetupMessageHandler
+  // Pointer to the Web UI. This is provided by CloudPrintSetupMessageHandler
   // when attached.
   DOMUI* dom_ui_;
 
diff --git a/chrome/browser/remoting/setup_flow.h b/chrome/browser/remoting/setup_flow.h
index f19f4dd..3fbd501 100644
--- a/chrome/browser/remoting/setup_flow.h
+++ b/chrome/browser/remoting/setup_flow.h
@@ -199,7 +199,7 @@ class SetupFlow : public DOMMessageHandler,
   void StartCurrentStep();
   void OnStepDone();
 
-  // Pointer to the DOM UI. This is provided by RemotingSetupMessageHandler
+  // Pointer to the Web UI. This is provided by RemotingSetupMessageHandler
   // when attached.
   DOMUI* dom_ui_;
 
diff --git a/chrome/browser/renderer_host/render_view_host.h b/chrome/browser/renderer_host/render_view_host.h
index 3e0e8d6..7dda546 100644
--- a/chrome/browser/renderer_host/render_view_host.h
+++ b/chrome/browser/renderer_host/render_view_host.h
@@ -358,7 +358,7 @@ class RenderViewHost : public RenderWidgetHost {
     is_extension_process_ = is_extension_process;
   }
 
-  // Sets a property with the given name and value on the DOM UI binding object.
+  // Sets a property with the given name and value on the Web UI binding object.
   // Must call AllowDOMUIBindings() on this renderer first.
   void SetDOMUIProperty(const std::string& name, const std::string& value);
 
diff --git a/chrome/browser/resources/shared/js/cr/command_line.js b/chrome/browser/resources/shared/js/cr/command_line.js
index 2333b51..3c03f93 100644
--- a/chrome/browser/resources/shared/js/cr/command_line.js
+++ b/chrome/browser/resources/shared/js/cr/command_line.js
@@ -7,7 +7,7 @@
  * command line string.
  *
  * This file depends on chrome.commandLineString, which is only set if your
- * DOM UI explicitly sets it.  The DOM UI based options dialog does this from
+ * Web UI explicitly sets it.  The Web UI based options dialog does this from
  * OptionsUI::RenderViewCreated, in options_ui.cc.
  */
 
diff --git a/chrome/browser/tab_contents/render_view_host_manager.cc b/chrome/browser/tab_contents/render_view_host_manager.cc
index 0364a38..8be2045 100644
--- a/chrome/browser/tab_contents/render_view_host_manager.cc
+++ b/chrome/browser/tab_contents/render_view_host_manager.cc
@@ -178,7 +178,7 @@ void RenderViewHostManager::DidNavigateMainFrame(
     // We should only hear this from our current renderer.
     DCHECK(render_view_host == render_view_host_);
 
-    // Even when there is no pending RVH, there may be a pending DOM UI.
+    // Even when there is no pending RVH, there may be a pending Web UI.
     if (pending_dom_ui_.get())
       CommitPending();
     return;
@@ -302,7 +302,7 @@ bool RenderViewHostManager::ShouldSwapProcessesForNavigation(
       render_view_host_->site_instance()->site();
   Profile* profile = delegate_->GetControllerForRenderManager().profile();
   if (WebUIFactory::UseWebUIForURL(profile, current_url)) {
-    // Force swap if it's not an acceptable URL for DOM UI.
+    // Force swap if it's not an acceptable URL for Web UI.
     if (!WebUIFactory::IsURLAcceptableForWebUI(profile, new_entry->url()))
       return true;
   } else {
@@ -367,7 +367,7 @@ SiteInstance* RenderViewHostManager::GetSiteInstanceForEntry(
   // If we haven't used our SiteInstance (and thus RVH) yet, then we can use it
   // for this entry.  We won't commit the SiteInstance to this site until the
   // navigation commits (in DidNavigate), unless the navigation entry was
-  // restored or it's a DOM UI as described below.
+  // restored or it's a Web UI as described below.
   if (!curr_instance->has_site()) {
     // If we've already created a SiteInstance for our destination, we don't
     // want to use this unused SiteInstance; use the existing one.  (We don't
@@ -501,14 +501,14 @@ void RenderViewHostManager::CommitPending() {
   // this triggers won't be able to figure out what's going on.
   bool will_focus_location_bar = delegate_->FocusLocationBarByDefault();
 
-  // Next commit the DOM UI, if any.
+  // Next commit the Web UI, if any.
   dom_ui_.swap(pending_dom_ui_);
   if (dom_ui_.get() && pending_dom_ui_.get() && !pending_render_view_host_)
     dom_ui_->DidBecomeActiveForReusedRenderView();
   pending_dom_ui_.reset();
 
   // It's possible for the pending_render_view_host_ to be NULL when we aren't
-  // crossing process boundaries. If so, we just needed to handle the DOM UI
+  // crossing process boundaries. If so, we just needed to handle the Web UI
   // committing above and we're done.
   if (!pending_render_view_host_) {
     if (will_focus_location_bar)
@@ -573,7 +573,7 @@ RenderViewHost* RenderViewHostManager::UpdateRendererStateForNavigate(
     cross_navigation_pending_ = false;
   }
 
-  // This will possibly create (set to NULL) a DOM UI object for the pending
+  // This will possibly create (set to NULL) a Web UI object for the pending
   // page. We'll use this later to give the page special access. This must
   // happen before the new renderer is created below so it will get bindings.
   // It must also happen after the above conditional call to CancelPending(),
diff --git a/chrome/browser/tab_contents/render_view_host_manager.h b/chrome/browser/tab_contents/render_view_host_manager.h
index 345b9cd..f89ad238 100644
--- a/chrome/browser/tab_contents/render_view_host_manager.h
+++ b/chrome/browser/tab_contents/render_view_host_manager.h
@@ -108,10 +108,10 @@ class RenderViewHostManager
     return pending_render_view_host_;
   }
 
-  // Returns the current committed DOM UI or NULL if none applies.
+  // Returns the current committed Web UI or NULL if none applies.
   DOMUI* dom_ui() const { return dom_ui_.get(); }
 
-  // Returns the DOM UI for the pending navigation, or NULL of none applies.
+  // Returns the Web UI for the pending navigation, or NULL of none applies.
   DOMUI* pending_dom_ui() const { return pending_dom_ui_.get(); }
 
   // Called when we want to instruct the renderer to navigate to the given
@@ -190,7 +190,7 @@ class RenderViewHostManager
   bool ShouldTransitionCrossSite();
 
   // Returns true if the two navigation entries are incompatible in some way
-  // other than site instances. Cases where this can happen include DOM UI
+  // other than site instances. Cases where this can happen include Web UI
   // to regular web pages. It will cause us to swap RenderViewHosts (and hence
   // RenderProcessHosts) even if the site instance would otherwise be the same.
   // As part of this, we'll also force new SiteInstances and BrowsingInstances.
@@ -217,7 +217,7 @@ class RenderViewHostManager
 
   // Sets the pending RenderViewHost/DOMUI to be the active one. Note that this
   // doesn't require the pending render_view_host_ pointer to be non-NULL, since
-  // there could be DOM UI switching as well. Call this for every commit.
+  // there could be Web UI switching as well. Call this for every commit.
   void CommitPending();
 
   // Helper method to terminate the pending RenderViewHost.
@@ -237,7 +237,7 @@ class RenderViewHostManager
   // the RenderViewHosts that we create.
   RenderViewHostDelegate* render_view_delegate_;
 
-  // Our RenderView host and its associated DOM UI (if any, will be NULL for
+  // Our RenderView host and its associated Web UI (if any, will be NULL for
   // non-DOM-UI pages). This object is responsible for all communication with
   // a child RenderView instance.
   RenderViewHost* render_view_host_;
@@ -245,13 +245,13 @@ class RenderViewHostManager
 
   // A RenderViewHost used to load a cross-site page. This remains hidden
   // while a cross-site request is pending until it calls DidNavigate. It may
-  // have an associated DOM UI, in which case the DOM UI pointer will be non-
+  // have an associated Web UI, in which case the Web UI pointer will be non-
   // NULL.
   //
   // The pending_dom_ui may be non-NULL even when the pending_render_view_host_
-  // is. This will happen when we're transitioning between two DOM UI pages:
+  // is. This will happen when we're transitioning between two Web UI pages:
   // the RVH won't be swapped, so the pending pointer will be unused, but there
-  // will be a pending DOM UI associated with the navigation.
+  // will be a pending Web UI associated with the navigation.
   RenderViewHost* pending_render_view_host_;
   scoped_ptr<DOMUI> pending_dom_ui_;
 
diff --git a/chrome/browser/tab_contents/render_view_host_manager_unittest.cc b/chrome/browser/tab_contents/render_view_host_manager_unittest.cc
index 3e19422..a2df005 100644
--- a/chrome/browser/tab_contents/render_view_host_manager_unittest.cc
+++ b/chrome/browser/tab_contents/render_view_host_manager_unittest.cc
@@ -254,14 +254,14 @@ TEST_F(RenderViewHostManagerTest, DOMUI) {
   EXPECT_TRUE(host == manager.current_host());
   EXPECT_FALSE(manager.pending_render_view_host());
 
-  // It's important that the site instance get set on the DOM UI page as soon
+  // It's important that the site instance get set on the Web UI page as soon
   // as the navigation starts, rather than lazily after it commits, so we don't
   // try to re-use the SiteInstance/process for non DOM-UI things that may
   // get loaded in between.
   EXPECT_TRUE(host->site_instance()->has_site());
   EXPECT_EQ(url, host->site_instance()->site());
 
-  // The DOM UI is committed immediately because the RenderViewHost has not been
+  // The Web UI is committed immediately because the RenderViewHost has not been
   // used yet. UpdateRendererStateForNavigate() took the short cut path.
   EXPECT_FALSE(manager.pending_dom_ui());
   EXPECT_TRUE(manager.dom_ui());
@@ -270,8 +270,8 @@ TEST_F(RenderViewHostManagerTest, DOMUI) {
   manager.DidNavigateMainFrame(host);
 }
 
-// Tests that chrome: URLs that are not DOM UI pages do not get grouped into
-// DOM UI renderers, even if --process-per-tab is enabled.  In that mode, we
+// Tests that chrome: URLs that are not Web UI pages do not get grouped into
+// Web UI renderers, even if --process-per-tab is enabled.  In that mode, we
 // still swap processes if ShouldSwapProcessesForNavigation is true.
 // Regression test for bug 46290.
 TEST_F(RenderViewHostManagerTest, NonDOMUIChromeURLs) {
@@ -280,13 +280,13 @@ TEST_F(RenderViewHostManagerTest, NonDOMUIChromeURLs) {
   RenderViewHostManager manager(&tab_contents, &tab_contents);
   manager.Init(profile_.get(), instance, MSG_ROUTING_NONE);
 
-  // NTP is a DOM UI page.
+  // NTP is a Web UI page.
   GURL ntp_url(chrome::kChromeUINewTabURL);
   NavigationEntry ntp_entry(NULL /* instance */, -1 /* page_id */, ntp_url,
                             GURL() /* referrer */, string16() /* title */,
                             PageTransition::TYPED);
 
-  // about: URLs are not DOM UI pages.
+  // about: URLs are not Web UI pages.
   GURL about_url(chrome::kAboutMemoryURL);
   // Rewrite so it looks like chrome://about/memory
   bool reverse_on_redirect = false;
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index 0c8e6de..ea76a4a 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -618,7 +618,7 @@ const string16& TabContents::GetTitle() const {
     // Don't override the title in view source mode.
     entry = controller_.GetActiveEntry();
     if (!(entry && entry->IsViewSourceMode())) {
-      // Give the DOM UI the chance to override our title.
+      // Give the Web UI the chance to override our title.
       const string16& title = our_dom_ui->overridden_title();
       if (!title.empty())
         return title;
@@ -1205,13 +1205,13 @@ bool TabContents::ShouldShowBookmarkBar() {
   // similar, but for non-first loads, we want to use the committed entry. This
   // is so the bookmarks bar disappears at the same time the page does.
   if (controller_.GetLastCommittedEntry()) {
-    // Not the first load, always use the committed DOM UI.
+    // Not the first load, always use the committed Web UI.
     return (render_manager_.dom_ui() == NULL) ?
         false : render_manager_.dom_ui()->force_bookmark_bar_visible();
   }
 
   // When it's the first load, we know either the pending one or the committed
-  // one will have the DOM UI in it (see GetDOMUIForCurrentState), and only one
+  // one will have the Web UI in it (see GetDOMUIForCurrentState), and only one
   // of them will be valid, so we can just check both.
   if (render_manager_.pending_dom_ui())
     return render_manager_.pending_dom_ui()->force_bookmark_bar_visible();
@@ -1727,29 +1727,29 @@ DOMUI* TabContents::GetDOMUIForCurrentState() {
   // initial load in a tab as a side effect of the way the RenderViewHostManager
   // works.
   //
-  //  - For the very first tab the load looks "normal". The new tab DOM UI is
+  //  - For the very first tab the load looks "normal". The new tab Web UI is
   //    the pending one, and we want it to apply here.
   //
   //  - For subsequent new tabs, they'll get a new SiteInstance which will then
   //    get switched to the one previously associated with the new tab pages.
   //    This switching will cause the manager to commit the RVH/DOMUI. So we'll
-  //    have a committed DOM UI in this case.
+  //    have a committed Web UI in this case.
   //
   // This condition handles all of these cases:
   //
   //  - First load in first tab: no committed nav entry + pending nav entry +
   //    pending dom ui:
-  //    -> Use pending DOM UI if any.
+  //    -> Use pending Web UI if any.
   //
   //  - First load in second tab: no committed nav entry + pending nav entry +
-  //    no pending DOM UI:
-  //    -> Use the committed DOM UI if any.
+  //    no pending Web UI:
+  //    -> Use the committed Web UI if any.
   //
   //  - Second navigation in any tab: committed nav entry + pending nav entry:
-  //    -> Use pending DOM UI if any.
+  //    -> Use pending Web UI if any.
   //
   //  - Normal state with no load: committed nav entry + no pending nav entry:
-  //    -> Use committed DOM UI.
+  //    -> Use committed Web UI.
   if (controller_.pending_entry() &&
       (controller_.GetLastCommittedEntry() ||
        render_manager_.pending_dom_ui()))
@@ -2258,7 +2258,7 @@ void TabContents::RenderViewCreated(RenderViewHost* render_view_host) {
     return;
 
   // When we're creating views, we're still doing initial setup, so we always
-  // use the pending DOM UI rather than any possibly existing committed one.
+  // use the pending Web UI rather than any possibly existing committed one.
   if (render_manager_.pending_dom_ui()) {
     render_manager_.pending_dom_ui()->RenderViewCreated(render_view_host);
   }
@@ -2584,11 +2584,11 @@ void TabContents::DocumentOnLoadCompletedInMainFrame(
 void TabContents::RequestOpenURL(const GURL& url, const GURL& referrer,
                                  WindowOpenDisposition disposition) {
   if (render_manager_.dom_ui()) {
-    // When we're a DOM UI, it will provide a page transition type for us (this
+    // When we're a Web UI, it will provide a page transition type for us (this
     // is so the new tab page can specify AUTO_BOOKMARK for automatically
     // generated suggestions).
     //
-    // Note also that we hide the referrer for DOM UI pages. We don't really
+    // Note also that we hide the referrer for Web UI pages. We don't really
     // want web sites to see a referrer of "chrome://blah" (and some
     // chrome: URLs might have search terms or other stuff we don't want to
     // send to the site), so we send no referrer.
diff --git a/chrome/browser/ui/cocoa/download/download_util_mac.mm b/chrome/browser/ui/cocoa/download/download_util_mac.mm
index baafbbf..8d953f5 100644
--- a/chrome/browser/ui/cocoa/download/download_util_mac.mm
+++ b/chrome/browser/ui/cocoa/download/download_util_mac.mm
@@ -47,7 +47,7 @@ void DragDownload(const DownloadItem* download,
   NSImage* dragImage = gfx::SkBitmapToNSImage(*icon);
 
   // Synthesize a drag event, since we don't have access to the actual event
-  // that initiated a drag (possibly consumed by the DOM UI, for example).
+  // that initiated a drag (possibly consumed by the Web UI, for example).
   NSPoint position = [[view window] mouseLocationOutsideOfEventStream];
   NSTimeInterval eventTime = [[NSApp currentEvent] timestamp];
   NSEvent* dragEvent = [NSEvent mouseEventWithType:NSLeftMouseDragged
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index 9f2d3a9..6cf1727 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -1443,8 +1443,8 @@ class RenderView : public RenderWidget,
   // DOM automation bindings are enabled.
   scoped_ptr<DomAutomationController> dom_automation_controller_;
 
-  // Allows DOM UI pages (new tab page, etc.) to talk to the browser. The JS
-  // object is only exposed when DOM UI bindings are enabled.
+  // Allows Web UI pages (new tab page, etc.) to talk to the browser. The JS
+  // object is only exposed when Web UI bindings are enabled.
   scoped_ptr<DOMUIBindings> dom_ui_bindings_;
 
   // External host exposed through automation controller.