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

Side by Side Diff: ui/views/controls/menu/menu_model_adapter.cc

Issue 8771006: views: Move the remaining file from views/ to ui/views/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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 "ui/views/controls/menu/menu_model_adapter.h" 5 #include "ui/views/controls/menu/menu_model_adapter.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "ui/base/l10n/l10n_util.h" 8 #include "ui/base/l10n/l10n_util.h"
9 #include "ui/base/models/menu_model.h" 9 #include "ui/base/models/menu_model.h"
10 #include "ui/views/controls/menu/submenu_view.h" 10 #include "ui/views/controls/menu/submenu_view.h"
11 #include "views/views_delegate.h" 11 #include "ui/views/views_delegate.h"
12 12
13 namespace views { 13 namespace views {
14 14
15 MenuModelAdapter::MenuModelAdapter(ui::MenuModel* menu_model) 15 MenuModelAdapter::MenuModelAdapter(ui::MenuModel* menu_model)
16 : menu_model_(menu_model), 16 : menu_model_(menu_model),
17 triggerable_event_flags_(ui::EF_LEFT_BUTTON_DOWN | 17 triggerable_event_flags_(ui::EF_LEFT_BUTTON_DOWN |
18 ui::EF_RIGHT_BUTTON_DOWN) { 18 ui::EF_RIGHT_BUTTON_DOWN) {
19 DCHECK(menu_model); 19 DCHECK(menu_model);
20 } 20 }
21 21
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 BuildMenuImpl(item, submodel); 191 BuildMenuImpl(item, submodel);
192 192
193 menu_map_[item] = submodel; 193 menu_map_[item] = submodel;
194 } 194 }
195 } 195 }
196 196
197 menu->set_has_icons(model->HasIcons()); 197 menu->set_has_icons(model->HasIcons());
198 } 198 }
199 199
200 } // namespace views 200 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/menu/menu_listener.h ('k') | ui/views/controls/menu/menu_scroll_view_container.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698