diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-04 22:07:12 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-04 22:07:12 +0000 |
commit | eddb2a80e8adc00bf71460ea9004635e801e4fa2 (patch) | |
tree | 138ad8dad59888a49240f16c16606f67cc946cbf /chrome/browser/chromeos/dom_ui | |
parent | 8b9765e56dfddf33374bfc14dcc5f9c954d60cdd (diff) | |
download | chromium_src-eddb2a80e8adc00bf71460ea9004635e801e4fa2.zip chromium_src-eddb2a80e8adc00bf71460ea9004635e801e4fa2.tar.gz chromium_src-eddb2a80e8adc00bf71460ea9004635e801e4fa2.tar.bz2 |
WebUI: Rename NativeMenuDOMUI to NativeMenuWebUI.
BUG=59945
TEST=trybots
Review URL: http://codereview.chromium.org/6368093
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73849 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/dom_ui')
-rw-r--r-- | chrome/browser/chromeos/dom_ui/menu_ui.cc | 4 | ||||
-rw-r--r-- | chrome/browser/chromeos/dom_ui/network_menu_ui.cc | 10 | ||||
-rw-r--r-- | chrome/browser/chromeos/dom_ui/wrench_menu_ui.cc | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/chromeos/dom_ui/menu_ui.cc b/chrome/browser/chromeos/dom_ui/menu_ui.cc index 2a5678f..24f0204 100644 --- a/chrome/browser/chromeos/dom_ui/menu_ui.cc +++ b/chrome/browser/chromeos/dom_ui/menu_ui.cc @@ -17,7 +17,7 @@ #include "base/values.h" #include "base/weak_ptr.h" #include "chrome/browser/browser_thread.h" -#include "chrome/browser/chromeos/views/native_menu_domui.h" +#include "chrome/browser/chromeos/views/native_menu_webui.h" #include "chrome/browser/chromeos/views/webui_menu_widget.h" #include "chrome/browser/dom_ui/web_ui_util.h" #include "chrome/browser/tab_contents/tab_contents.h" @@ -508,7 +508,7 @@ chromeos::WebUIMenuControl* MenuHandlerBase::GetMenuControl() { chromeos::WebUIMenuWidget::FindWebUIMenuWidget( dom_ui_->tab_contents()->GetNativeView()); if (widget) - return widget->domui_menu(); // NativeMenuDOMUI implements WebUIMenuControl + return widget->webui_menu(); // NativeMenuWebUI implements WebUIMenuControl else return NULL; } diff --git a/chrome/browser/chromeos/dom_ui/network_menu_ui.cc b/chrome/browser/chromeos/dom_ui/network_menu_ui.cc index 7140dcb..e80c04ae 100644 --- a/chrome/browser/chromeos/dom_ui/network_menu_ui.cc +++ b/chrome/browser/chromeos/dom_ui/network_menu_ui.cc @@ -10,7 +10,7 @@ #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/chromeos/status/network_menu.h" -#include "chrome/browser/chromeos/views/native_menu_domui.h" +#include "chrome/browser/chromeos/views/native_menu_webui.h" #include "chrome/browser/chromeos/views/webui_menu_widget.h" #include "chrome/browser/dom_ui/web_ui_theme_source.h" #include "chrome/browser/tab_contents/tab_contents.h" @@ -80,9 +80,9 @@ void NetworkMenuHandler::HandleAction(const ListValue* values) { = chromeos::WebUIMenuWidget::FindWebUIMenuWidget( dom_ui_->tab_contents()->GetNativeView()); if (widget) { - chromeos::NativeMenuDOMUI* domui_menu = widget->domui_menu(); - if (domui_menu) - domui_menu->Hide(); + chromeos::NativeMenuWebUI* webui_menu = widget->webui_menu(); + if (webui_menu) + webui_menu->Hide(); } } } @@ -194,7 +194,7 @@ DictionaryValue* NetworkMenuUI::CreateMenuItem(const ui::MenuModel* model, views::Menu2* NetworkMenuUI::CreateMenu2(ui::MenuModel* model) { views::Menu2* menu = new views::Menu2(model); - NativeMenuDOMUI::SetMenuURL( + NativeMenuWebUI::SetMenuURL( menu, GURL(StringPrintf("chrome://%s", chrome::kChromeUINetworkMenu))); return menu; } diff --git a/chrome/browser/chromeos/dom_ui/wrench_menu_ui.cc b/chrome/browser/chromeos/dom_ui/wrench_menu_ui.cc index 9a1c35c..7bff31e 100644 --- a/chrome/browser/chromeos/dom_ui/wrench_menu_ui.cc +++ b/chrome/browser/chromeos/dom_ui/wrench_menu_ui.cc @@ -11,7 +11,7 @@ #include "base/weak_ptr.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_list.h" -#include "chrome/browser/chromeos/views/native_menu_domui.h" +#include "chrome/browser/chromeos/views/native_menu_webui.h" #include "chrome/browser/chromeos/views/webui_menu_widget.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/browser.h" @@ -106,7 +106,7 @@ void WrenchMenuUI::UpdateZoomControls() { views::Menu2* WrenchMenuUI::CreateMenu2(ui::MenuModel* model) { views::Menu2* menu = new views::Menu2(model); - NativeMenuDOMUI::SetMenuURL( + NativeMenuWebUI::SetMenuURL( menu, GURL(StringPrintf("chrome://%s", chrome::kChromeUIWrenchMenu))); return menu; } |