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

Side by Side Diff: views/controls/menu/native_menu_x.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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "views/controls/menu/native_menu_x.h" 5 #include "views/controls/menu/native_menu_x.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "gfx/canvas_skia.h" 9 #include "gfx/canvas_skia.h"
10 #include "gfx/skia_util.h" 10 #include "gfx/skia_util.h"
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 149
150 if (model->GetTypeAt(index) == ui::MenuModel::TYPE_SUBMENU) { 150 if (model->GetTypeAt(index) == ui::MenuModel::TYPE_SUBMENU) {
151 DCHECK(mitem->HasSubmenu()); 151 DCHECK(mitem->HasSubmenu());
152 UpdateMenuFromModel(mitem->GetSubmenu(), model->GetSubmenuModelAt(index)); 152 UpdateMenuFromModel(mitem->GetSubmenu(), model->GetSubmenuModelAt(index));
153 } 153 }
154 } 154 }
155 } 155 }
156 156
157 // MenuWrapper, public: 157 // MenuWrapper, public:
158 158
159 #if !defined(OS_CHROMEOS)
160 // static 159 // static
161 MenuWrapper* MenuWrapper::CreateWrapper(Menu2* menu) { 160 MenuWrapper* MenuWrapper::CreateWrapper(Menu2* menu) {
162 return new NativeMenuX(menu); 161 return new NativeMenuX(menu);
163 } 162 }
164 #endif
165 163
166 } // namespace views 164 } // namespace views
OLDNEW
« no previous file with comments | « views/controls/menu/native_menu_gtk.cc ('k') | views/controls/textfield/native_textfield_views.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698