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

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

Issue 10358013: views: Mark single-argument constructors as explicit. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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) 2012 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 "base/utf_string_conversions.h" 5 #include "base/utf_string_conversions.h"
6 #include "ui/base/l10n/l10n_util.h" 6 #include "ui/base/l10n/l10n_util.h"
7 #include "ui/base/models/menu_model.h" 7 #include "ui/base/models/menu_model.h"
8 #include "ui/base/models/menu_model_delegate.h" 8 #include "ui/base/models/menu_model_delegate.h"
9 #include "ui/views/controls/menu/menu_item_view.h" 9 #include "ui/views/controls/menu/menu_item_view.h"
10 #include "ui/views/controls/menu/menu_model_adapter.h" 10 #include "ui/views/controls/menu/menu_model_adapter.h"
11 #include "ui/views/controls/menu/menu_runner.h" 11 #include "ui/views/controls/menu/menu_runner.h"
12 #include "ui/views/controls/menu/submenu_view.h" 12 #include "ui/views/controls/menu/submenu_view.h"
13 #include "ui/views/test/views_test_base.h" 13 #include "ui/views/test/views_test_base.h"
14 14
15 namespace { 15 namespace {
16 16
17 // Base command id for test menu and its submenu. 17 // Base command id for test menu and its submenu.
18 const int kRootIdBase = 100; 18 const int kRootIdBase = 100;
19 const int kSubmenuIdBase = 200; 19 const int kSubmenuIdBase = 200;
20 20
21 // Offset to return for GetFirstItemIndex(). This is an arbitrary 21 // Offset to return for GetFirstItemIndex(). This is an arbitrary
22 // number to ensure that we aren't assuming it is 0. 22 // number to ensure that we aren't assuming it is 0.
23 const int kFirstItemIndex = 25; 23 const int kFirstItemIndex = 25;
24 24
25 class MenuModelBase : public ui::MenuModel { 25 class MenuModelBase : public ui::MenuModel {
26 public: 26 public:
27 MenuModelBase(int command_id_base) : command_id_base_(command_id_base), 27 explicit MenuModelBase(int command_id_base)
28 last_activation_(-1) { 28 : command_id_base_(command_id_base),
29 last_activation_(-1) {
29 } 30 }
30 31
31 virtual ~MenuModelBase() { 32 virtual ~MenuModelBase() {
32 } 33 }
33 34
34 // ui::MenuModel implementation: 35 // ui::MenuModel implementation:
35 36
36 virtual bool HasIcons() const OVERRIDE { 37 virtual bool HasIcons() const OVERRIDE {
37 return false; 38 return false;
38 } 39 }
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 submodel->set_last_activation(-1); 299 submodel->set_last_activation(-1);
299 } 300 }
300 301
301 // Check that selecting the root item is safe. The MenuModel does 302 // Check that selecting the root item is safe. The MenuModel does
302 // not care about the root so MenuModelAdapter should do nothing 303 // not care about the root so MenuModelAdapter should do nothing
303 // (not hit the NOTREACHED check) when the root is selected. 304 // (not hit the NOTREACHED check) when the root is selected.
304 static_cast<views::MenuDelegate*>(&delegate)->SelectionChanged(menu); 305 static_cast<views::MenuDelegate*>(&delegate)->SelectionChanged(menu);
305 } 306 }
306 307
307 } // namespace views 308 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/combobox/native_combobox_views_unittest.cc ('k') | ui/views/controls/menu/native_menu_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698