diff options
11 files changed, 20 insertions, 20 deletions
diff --git a/chrome/browser/chromeos/dom_ui/internet_options_handler.h b/chrome/browser/chromeos/dom_ui/internet_options_handler.h index 50d7be7..f72d9cc 100644 --- a/chrome/browser/chromeos/dom_ui/internet_options_handler.h +++ b/chrome/browser/chromeos/dom_ui/internet_options_handler.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. @@ -121,7 +121,7 @@ class InternetOptionsHandler // If any network is currently active, this is its service path. std::string active_network_; - // A boolean flag of whether to use DOMUI for connect UI. True to use DOMUI + // A boolean flag of whether to use WebUI for connect UI. True to use WebUI // and false to use Views dialogs. bool use_settings_ui_; diff --git a/chrome/browser/chromeos/language_preferences.h b/chrome/browser/chromeos/language_preferences.h index 2dfb95e..bb00d5d 100644 --- a/chrome/browser/chromeos/language_preferences.h +++ b/chrome/browser/chromeos/language_preferences.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. @@ -145,7 +145,7 @@ const size_t kNumMozcIntegerPrefs = 1; // --------------------------------------------------------------------------- // TODO(yusukes): Temporary solution for View version of modifier key remapper. // Remove RemapType and kXkbModifierMultipleChoicePrefs when we finish to -// migrate to DOMUI. +// migrate to WebUI. enum RemapType { kNoRemap = 0, kSwapCtrlAndAlt = 1, diff --git a/chrome/browser/chromeos/notifications/balloon_collection_impl.h b/chrome/browser/chromeos/notifications/balloon_collection_impl.h index 7e138ec..b93265a 100644 --- a/chrome/browser/chromeos/notifications/balloon_collection_impl.h +++ b/chrome/browser/chromeos/notifications/balloon_collection_impl.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. @@ -76,7 +76,7 @@ class BalloonCollectionImpl : public BalloonCollection, const NotificationSource& source, const NotificationDetails& details); - // Adds a callback for DOMUI message. Returns true if the callback + // Adds a callback for WebUI message. Returns true if the callback // is succssfully registered, or false otherwise. It fails to add if // there is no notification that matches NotificationDelegate::id(), // or a callback for given message already exists. The callback diff --git a/chrome/browser/chromeos/notifications/balloon_view_host.h b/chrome/browser/chromeos/notifications/balloon_view_host.h index b72b4b6..c4a1d154 100644 --- a/chrome/browser/chromeos/notifications/balloon_view_host.h +++ b/chrome/browser/chromeos/notifications/balloon_view_host.h @@ -26,14 +26,14 @@ class BalloonViewHost : public ::BalloonViewHost { explicit BalloonViewHost(Balloon* balloon) : ::BalloonViewHost(balloon) {} virtual ~BalloonViewHost(); - // Adds a callback for DOMUI message. Returns true if the callback + // Adds a callback for WebUI message. Returns true if the callback // is succssfully registered, or false otherwise. It fails to add if // a callback for given message already exists. The callback object // is owned and deleted by callee. bool AddDOMUIMessageCallback(const std::string& message, MessageCallback* callback); - // Process DOMUI message. + // Process WebUI message. virtual void ProcessDOMUIMessage(const ViewHostMsg_DomMessage_Params& params); private: diff --git a/chrome/browser/chromeos/proxy_config_service_impl.h b/chrome/browser/chromeos/proxy_config_service_impl.h index 5f37b44..48643ee 100644 --- a/chrome/browser/chromeos/proxy_config_service_impl.h +++ b/chrome/browser/chromeos/proxy_config_service_impl.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. @@ -50,7 +50,7 @@ class ProxyConfigServiceImpl // (GetLatestProxyConfig, AddObserver, RemoveObserver). // // From the UI thread, it is accessed via - // DOMUI::GetProfile::GetChromeOSProxyConfigServiceImpl to allow user to read + // WebUI::GetProfile::GetChromeOSProxyConfigServiceImpl to allow user to read // or modify the proxy configuration via UIGetProxyConfig or // UISetProxyConfigTo* respectively. // The new modified proxy config is posted to the IO thread through diff --git a/chrome/browser/chromeos/status/input_method_menu.h b/chrome/browser/chromeos/status/input_method_menu.h index 0d74bd4..3703d30 100644 --- a/chrome/browser/chromeos/status/input_method_menu.h +++ b/chrome/browser/chromeos/status/input_method_menu.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. @@ -118,7 +118,7 @@ class InputMethodMenu : public views::ViewMenuDelegate, // Sub classes have to implement the interface. This interface should return // true if the dropdown menu should show an item like "Customize languages - // and input..." DOMUI. + // and input..." WebUI. virtual bool ShouldSupportConfigUI() = 0; // Sub classes have to implement the interface which opens an UI for diff --git a/chrome/browser/chromeos/status/input_method_menu_button.cc b/chrome/browser/chromeos/status/input_method_menu_button.cc index 194712c..3060760 100644 --- a/chrome/browser/chromeos/status/input_method_menu_button.cc +++ b/chrome/browser/chromeos/status/input_method_menu_button.cc @@ -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. @@ -134,7 +134,7 @@ void InputMethodMenuButton::UpdateUI(const std::string& input_method_id, } void InputMethodMenuButton::OpenConfigUI() { - host_->OpenButtonOptions(this); // ask browser to open the DOMUI page. + host_->OpenButtonOptions(this); // ask browser to open the WebUI page. } bool InputMethodMenuButton::ShouldSupportConfigUI() { diff --git a/chrome/browser/chromeos/status/network_menu.h b/chrome/browser/chromeos/status/network_menu.h index cba9acb..d4f9315 100644 --- a/chrome/browser/chromeos/status/network_menu.h +++ b/chrome/browser/chromeos/status/network_menu.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. @@ -75,7 +75,7 @@ class NetworkMenu : public views::ViewMenuDelegate, NetworkMenu(); virtual ~NetworkMenu(); - // Retrieves network info for the DOMUI NetworkMenu (NetworkMenuUI). + // Retrieves network info for the WebUI NetworkMenu (NetworkMenuUI). // |index| is the index in menu_items_, set when the menu is built. bool GetNetworkAt(int index, NetworkInfo* info) const; diff --git a/chrome/browser/chromeos/views/native_menu_webui.cc b/chrome/browser/chromeos/views/native_menu_webui.cc index 6f9e1f0..2d41f1a 100644 --- a/chrome/browser/chromeos/views/native_menu_webui.cc +++ b/chrome/browser/chromeos/views/native_menu_webui.cc @@ -71,7 +71,7 @@ namespace chromeos { // static void NativeMenuWebUI::SetMenuURL(views::Menu2* menu2, const GURL& url) { - // No-op if DOMUI menu is disabled. + // No-op if WebUI menu is disabled. if (!MenuUI::IsEnabled()) return; diff --git a/chrome/browser/chromeos/views/native_menu_webui.h b/chrome/browser/chromeos/views/native_menu_webui.h index 0b9118e..1a04189 100644 --- a/chrome/browser/chromeos/views/native_menu_webui.h +++ b/chrome/browser/chromeos/views/native_menu_webui.h @@ -36,7 +36,7 @@ namespace chromeos { class MenuLocator; class WebUIMenuWidget; -// A DOMUI implementation of MenuWrapper. +// A WebUI implementation of MenuWrapper. class NativeMenuWebUI : public views::MenuWrapper, public WebUIMenuControl, public MessageLoop::Dispatcher { @@ -145,7 +145,7 @@ class NativeMenuWebUI : public views::MenuWrapper, // Vector of listeners to receive callbacks when the menu opens. ObserverList<views::MenuListener> listeners_; - // URL to invoke Menu DOMUI. Default menu is chrome://menu, but + // URL to invoke Menu WebUI. Default menu is chrome://menu, but // custom menu can use different url using SetMenuURL method // (e.g. chrome://wrench-menu for wrench menu). GURL menu_url_; diff --git a/chrome/browser/chromeos/views/webui_menu_widget.cc b/chrome/browser/chromeos/views/webui_menu_widget.cc index b51d57e..28bdd1a 100644 --- a/chrome/browser/chromeos/views/webui_menu_widget.cc +++ b/chrome/browser/chromeos/views/webui_menu_widget.cc @@ -134,7 +134,7 @@ WebUIMenuWidget::WebUIMenuWidget(chromeos::NativeMenuWebUI* webui_menu, is_root_(root) { DCHECK(webui_menu_); // TODO(oshima): Disabling transparent until we migrate bookmark - // menus to DOMUI. See crosbug.com/7718. + // menus to WebUI. See crosbug.com/7718. // MakeTransparent(); } |