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

Side by Side Diff: ui/views/widget/widget_unittest.cc

Issue 12212136: Ensures Widget::InitParams::top_level is set correctly before calling (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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/views/widget/widget.cc ('k') | no next file » | 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/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/memory/scoped_ptr.h" 6 #include "base/memory/scoped_ptr.h"
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 #include "ui/base/events/event_utils.h" 10 #include "ui/base/events/event_utils.h"
(...skipping 1392 matching lines...) Expand 10 before | Expand all | Expand 10 after
1403 widget->OnGestureEvent(&end); 1403 widget->OnGestureEvent(&end);
1404 1404
1405 EXPECT_EQ(1, scroll_view->GetEventCount(ui::ET_GESTURE_SCROLL_BEGIN)); 1405 EXPECT_EQ(1, scroll_view->GetEventCount(ui::ET_GESTURE_SCROLL_BEGIN));
1406 EXPECT_EQ(1, scroll_view->GetEventCount(ui::ET_GESTURE_SCROLL_UPDATE)); 1406 EXPECT_EQ(1, scroll_view->GetEventCount(ui::ET_GESTURE_SCROLL_UPDATE));
1407 EXPECT_EQ(1, scroll_view->GetEventCount(ui::ET_GESTURE_SCROLL_END)); 1407 EXPECT_EQ(1, scroll_view->GetEventCount(ui::ET_GESTURE_SCROLL_END));
1408 } 1408 }
1409 1409
1410 widget->CloseNow(); 1410 widget->CloseNow();
1411 } 1411 }
1412 1412
1413 // Used by SetTopLevelCorrectly to track calls to OnBeforeWidgetInit().
1414 class VerifyTopLevelDelegate : public TestViewsDelegate {
1415 public:
1416 VerifyTopLevelDelegate()
1417 : on_before_init_called_(false),
1418 is_top_level_(false) {
1419 }
1420
1421 bool on_before_init_called() const { return on_before_init_called_; }
1422 bool is_top_level() const { return is_top_level_; }
1423
1424 virtual void OnBeforeWidgetInit(
1425 Widget::InitParams* params,
1426 internal::NativeWidgetDelegate* delegate) OVERRIDE {
1427 on_before_init_called_ = true;
1428 is_top_level_ = params->top_level;
1429 }
1430
1431 private:
1432 bool on_before_init_called_;
1433 bool is_top_level_;
1434
1435 DISALLOW_COPY_AND_ASSIGN(VerifyTopLevelDelegate);
1436 };
1437
1438 // Verifies |top_level| is correctly passed to
1439 // ViewsDelegate::OnBeforeWidgetInit().
1440 TEST_F(WidgetTest, SetTopLevelCorrectly) {
1441 set_views_delegate(NULL);
1442 VerifyTopLevelDelegate* delegate = new VerifyTopLevelDelegate;
1443 set_views_delegate(delegate); // ViewsTestBase takes ownership.
1444 scoped_ptr<Widget> widget(new Widget);
1445 Widget::InitParams params =
1446 CreateParams(views::Widget::InitParams::TYPE_POPUP);
1447 params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
1448 widget->Init(params);
1449 EXPECT_TRUE(delegate->on_before_init_called());
1450 EXPECT_TRUE(delegate->is_top_level());
1451 }
1452
1413 } // namespace 1453 } // namespace
1414 } // namespace views 1454 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/widget/widget.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698