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

Unified Diff: chrome/browser/chromeos/views/native_menu_domui.cc

Issue 6155011: Implementing context menu for the new views textfield. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: resolved small merge conflict Created 9 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « app/resources/app_strings.grd ('k') | views/controls/menu/native_menu_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/views/native_menu_domui.cc
diff --git a/chrome/browser/chromeos/views/native_menu_domui.cc b/chrome/browser/chromeos/views/native_menu_domui.cc
index 10a2f5c59e04869cc9b724d5715c26bc2b2de33a..2fa3395a47d1688c7cb233c1e152e510497ef170 100644
--- a/chrome/browser/chromeos/views/native_menu_domui.cc
+++ b/chrome/browser/chromeos/views/native_menu_domui.cc
@@ -400,24 +400,3 @@ NativeMenuDOMUI* NativeMenuDOMUI::FindMenuAt(const gfx::Point& point) {
}
} // namespace chromeos
-
-////////////////////////////////////////////////////////////////////////////////
-// MenuWrapper, public:
-
-namespace views {
-
-// static
-MenuWrapper* MenuWrapper::CreateWrapper(Menu2* menu) {
- ui::MenuModel* model = menu->model();
- if (chromeos::MenuUI::IsEnabled()) {
- return new chromeos::NativeMenuDOMUI(model, true);
- } else {
-#if defined(TOUCH_UI)
- return new NativeMenuX(menu);
-#else
- return new NativeMenuGtk(menu);
-#endif
- }
-}
-
-} // namespace views
« no previous file with comments | « app/resources/app_strings.grd ('k') | views/controls/menu/native_menu_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698