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

Side by Side Diff: ui/views/controls/combobox/native_combobox_views_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) 2012 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/keycodes/keyboard_codes.h" 6 #include "ui/base/keycodes/keyboard_codes.h"
7 #include "ui/base/models/combobox_model.h" 7 #include "ui/base/models/combobox_model.h"
8 #include "ui/views/controls/combobox/combobox.h" 8 #include "ui/views/controls/combobox/combobox.h"
9 #include "ui/views/controls/combobox/native_combobox_views.h" 9 #include "ui/views/controls/combobox/native_combobox_views.h"
10 #include "ui/views/ime/mock_input_method.h" 10 #include "ui/views/ime/mock_input_method.h"
11 #include "ui/views/test/views_test_base.h" 11 #include "ui/views/test/views_test_base.h"
12 #include "ui/views/widget/native_widget_private.h" 12 #include "ui/views/widget/native_widget_private.h"
13 #include "ui/views/widget/widget.h" 13 #include "ui/views/widget/widget.h"
14 14
15 namespace { 15 namespace {
16 16
17 // A wrapper of Combobox to intercept the result of OnKeyPressed() and 17 // A wrapper of Combobox to intercept the result of OnKeyPressed() and
18 // OnKeyReleased() methods. 18 // OnKeyReleased() methods.
19 class TestCombobox : public views::Combobox { 19 class TestCombobox : public views::Combobox {
20 public: 20 public:
21 TestCombobox(ui::ComboboxModel* model) 21 explicit TestCombobox(ui::ComboboxModel* model)
22 : Combobox(model), 22 : Combobox(model),
23 key_handled_(false), 23 key_handled_(false),
24 key_received_(false) { 24 key_received_(false) {
25 } 25 }
26 26
27 virtual bool OnKeyPressed(const views::KeyEvent& e) OVERRIDE { 27 virtual bool OnKeyPressed(const views::KeyEvent& e) OVERRIDE {
28 key_received_ = true; 28 key_received_ = true;
29 key_handled_ = views::Combobox::OnKeyPressed(e); 29 key_handled_ = views::Combobox::OnKeyPressed(e);
30 return key_handled_; 30 return key_handled_;
31 } 31 }
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 widget_->SetContentsView(container); 186 widget_->SetContentsView(container);
187 container->AddChildView(combobox_); 187 container->AddChildView(combobox_);
188 188
189 combobox_view_ = static_cast<NativeComboboxViews*>( 189 combobox_view_ = static_cast<NativeComboboxViews*>(
190 combobox_->GetNativeWrapperForTesting()); 190 combobox_->GetNativeWrapperForTesting());
191 ASSERT_TRUE(combobox_view_); 191 ASSERT_TRUE(combobox_view_);
192 ASSERT_FALSE(combobox_view_->enabled()); 192 ASSERT_FALSE(combobox_view_->enabled());
193 } 193 }
194 194
195 } // namespace views 195 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/button/text_button.h ('k') | ui/views/controls/menu/menu_model_adapter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698