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

Side by Side Diff: ui/views/controls/combobox/native_combobox_views_unittest.cc

Issue 16922010: Rewrite scoped_ptr<T>(NULL) to use the default ctor in ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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
« no previous file with comments | « ui/oak/oak_window.cc ('k') | ui/views/controls/scrollbar/scrollbar_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/strings/utf_string_conversions.h" 5 #include "base/strings/utf_string_conversions.h"
6 #include "ui/base/events/event.h" 6 #include "ui/base/events/event.h"
7 #include "ui/base/keycodes/keyboard_codes.h" 7 #include "ui/base/keycodes/keyboard_codes.h"
8 #include "ui/base/models/combobox_model.h" 8 #include "ui/base/models/combobox_model.h"
9 #include "ui/views/controls/combobox/combobox.h" 9 #include "ui/views/controls/combobox/combobox.h"
10 #include "ui/views/controls/combobox/native_combobox_views.h" 10 #include "ui/views/controls/combobox/native_combobox_views.h"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 } // namespace 72 } // namespace
73 73
74 namespace views { 74 namespace views {
75 75
76 class NativeComboboxViewsTest : public ViewsTestBase { 76 class NativeComboboxViewsTest : public ViewsTestBase {
77 public: 77 public:
78 NativeComboboxViewsTest() 78 NativeComboboxViewsTest()
79 : widget_(NULL), 79 : widget_(NULL),
80 combobox_(NULL), 80 combobox_(NULL),
81 combobox_view_(NULL), 81 combobox_view_(NULL),
82 model_(NULL), 82 input_method_(NULL) {}
83 input_method_(NULL) {
84 }
85 83
86 // ::testing::Test: 84 // ::testing::Test:
87 virtual void SetUp() { 85 virtual void SetUp() {
88 ViewsTestBase::SetUp(); 86 ViewsTestBase::SetUp();
89 } 87 }
90 88
91 virtual void TearDown() { 89 virtual void TearDown() {
92 if (widget_) 90 if (widget_)
93 widget_->Close(); 91 widget_->Close();
94 ViewsTestBase::TearDown(); 92 ViewsTestBase::TearDown();
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 widget_->SetContentsView(container); 185 widget_->SetContentsView(container);
188 container->AddChildView(combobox_); 186 container->AddChildView(combobox_);
189 187
190 combobox_view_ = static_cast<NativeComboboxViews*>( 188 combobox_view_ = static_cast<NativeComboboxViews*>(
191 combobox_->GetNativeWrapperForTesting()); 189 combobox_->GetNativeWrapperForTesting());
192 ASSERT_TRUE(combobox_view_); 190 ASSERT_TRUE(combobox_view_);
193 ASSERT_FALSE(combobox_view_->enabled()); 191 ASSERT_FALSE(combobox_view_->enabled());
194 } 192 }
195 193
196 } // namespace views 194 } // namespace views
OLDNEW
« no previous file with comments | « ui/oak/oak_window.cc ('k') | ui/views/controls/scrollbar/scrollbar_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698