Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(781)

Side by Side Diff: chrome/browser/chromeos/dom_ui/network_menu_ui.cc

Issue 6250123: WebUI: Change DOMUI to WebUI in two chromeos classes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: avi review Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/dom_ui/network_menu_ui.h" 5 #include "chrome/browser/chromeos/dom_ui/network_menu_ui.h"
6 6
7 #include "base/values.h" 7 #include "base/values.h"
8 #include "base/string_number_conversions.h" 8 #include "base/string_number_conversions.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "chrome/app/chrome_command_ids.h" 10 #include "chrome/app/chrome_command_ids.h"
11 #include "chrome/browser/browser_thread.h" 11 #include "chrome/browser/browser_thread.h"
12 #include "chrome/browser/chromeos/status/network_menu.h" 12 #include "chrome/browser/chromeos/status/network_menu.h"
13 #include "chrome/browser/chromeos/views/domui_menu_widget.h"
14 #include "chrome/browser/chromeos/views/native_menu_domui.h" 13 #include "chrome/browser/chromeos/views/native_menu_domui.h"
14 #include "chrome/browser/chromeos/views/webui_menu_widget.h"
15 #include "chrome/browser/dom_ui/web_ui_theme_source.h" 15 #include "chrome/browser/dom_ui/web_ui_theme_source.h"
16 #include "chrome/browser/tab_contents/tab_contents.h" 16 #include "chrome/browser/tab_contents/tab_contents.h"
17 #include "chrome/common/url_constants.h" 17 #include "chrome/common/url_constants.h"
18 #include "googleurl/src/gurl.h" 18 #include "googleurl/src/gurl.h"
19 #include "grit/browser_resources.h" 19 #include "grit/browser_resources.h"
20 #include "grit/generated_resources.h" 20 #include "grit/generated_resources.h"
21 #include "ui/base/l10n/l10n_util.h" 21 #include "ui/base/l10n/l10n_util.h"
22 #include "views/controls/menu/menu_2.h" 22 #include "views/controls/menu/menu_2.h"
23 23
24 namespace { 24 namespace {
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 &NetworkMenuHandler::HandleAction)); 69 &NetworkMenuHandler::HandleAction));
70 } 70 }
71 71
72 void NetworkMenuHandler::HandleAction(const ListValue* values) { 72 void NetworkMenuHandler::HandleAction(const ListValue* values) {
73 ui::MenuModel* model = GetMenuModel(); 73 ui::MenuModel* model = GetMenuModel();
74 if (model) { 74 if (model) {
75 chromeos::NetworkMenuUI* network_menu_ui = 75 chromeos::NetworkMenuUI* network_menu_ui =
76 static_cast<chromeos::NetworkMenuUI*>(dom_ui_); 76 static_cast<chromeos::NetworkMenuUI*>(dom_ui_);
77 bool close_menu = network_menu_ui->ModelAction(model, values); 77 bool close_menu = network_menu_ui->ModelAction(model, values);
78 if (close_menu) { 78 if (close_menu) {
79 chromeos::DOMUIMenuWidget* widget 79 chromeos::WebUIMenuWidget* widget
80 = chromeos::DOMUIMenuWidget::FindDOMUIMenuWidget( 80 = chromeos::WebUIMenuWidget::FindWebUIMenuWidget(
81 dom_ui_->tab_contents()->GetNativeView()); 81 dom_ui_->tab_contents()->GetNativeView());
82 if (widget) { 82 if (widget) {
83 chromeos::NativeMenuDOMUI* domui_menu = widget->domui_menu(); 83 chromeos::NativeMenuDOMUI* domui_menu = widget->domui_menu();
84 if (domui_menu) 84 if (domui_menu)
85 domui_menu->Hide(); 85 domui_menu->Hide();
86 } 86 }
87 } 87 }
88 } 88 }
89 } 89 }
90 90
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 } 193 }
194 194
195 views::Menu2* NetworkMenuUI::CreateMenu2(ui::MenuModel* model) { 195 views::Menu2* NetworkMenuUI::CreateMenu2(ui::MenuModel* model) {
196 views::Menu2* menu = new views::Menu2(model); 196 views::Menu2* menu = new views::Menu2(model);
197 NativeMenuDOMUI::SetMenuURL( 197 NativeMenuDOMUI::SetMenuURL(
198 menu, GURL(StringPrintf("chrome://%s", chrome::kChromeUINetworkMenu))); 198 menu, GURL(StringPrintf("chrome://%s", chrome::kChromeUINetworkMenu)));
199 return menu; 199 return menu;
200 } 200 }
201 201
202 } // namespace chromeos 202 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/dom_ui/menu_ui.cc ('k') | chrome/browser/chromeos/dom_ui/wrench_menu_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698