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

Side by Side Diff: ui/views/corewm/tooltip_controller_unittest.cc

Issue 196063002: Move wm/core to wm namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 9 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/corewm/tooltip_controller.h" 5 #include "ui/views/corewm/tooltip_controller.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "ui/aura/client/cursor_client.h" 8 #include "ui/aura/client/cursor_client.h"
9 #include "ui/aura/client/screen_position_client.h" 9 #include "ui/aura/client/screen_position_client.h"
10 #include "ui/aura/client/tooltip_client.h" 10 #include "ui/aura/client/tooltip_client.h"
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 } 69 }
70 70
71 } // namespace 71 } // namespace
72 72
73 class TooltipControllerTest : public aura::test::AuraTestBase { 73 class TooltipControllerTest : public aura::test::AuraTestBase {
74 public: 74 public:
75 TooltipControllerTest() : view_(NULL) {} 75 TooltipControllerTest() : view_(NULL) {}
76 virtual ~TooltipControllerTest() {} 76 virtual ~TooltipControllerTest() {}
77 77
78 virtual void SetUp() OVERRIDE { 78 virtual void SetUp() OVERRIDE {
79 wm_state_.reset(new views::corewm::WMState); 79 wm_state_.reset(new wm::WMState);
80 aura::test::AuraTestBase::SetUp(); 80 aura::test::AuraTestBase::SetUp();
81 #if defined(OS_CHROMEOS) 81 #if defined(OS_CHROMEOS)
82 controller_.reset(new TooltipController( 82 controller_.reset(new TooltipController(
83 scoped_ptr<views::corewm::Tooltip>( 83 scoped_ptr<views::corewm::Tooltip>(
84 new views::corewm::TooltipAura(gfx::SCREEN_TYPE_ALTERNATE)))); 84 new views::corewm::TooltipAura(gfx::SCREEN_TYPE_ALTERNATE))));
85 root_window()->AddPreTargetHandler(controller_.get()); 85 root_window()->AddPreTargetHandler(controller_.get());
86 SetTooltipClient(root_window(), controller_.get()); 86 SetTooltipClient(root_window(), controller_.get());
87 #endif 87 #endif
88 widget_.reset(CreateWidget(root_window())); 88 widget_.reset(CreateWidget(root_window()));
89 widget_->SetContentsView(new View); 89 widget_->SetContentsView(new View);
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 scoped_ptr<TooltipControllerTestHelper> helper_; 130 scoped_ptr<TooltipControllerTestHelper> helper_;
131 scoped_ptr<aura::test::EventGenerator> generator_; 131 scoped_ptr<aura::test::EventGenerator> generator_;
132 132
133 private: 133 private:
134 scoped_ptr<TooltipController> controller_; 134 scoped_ptr<TooltipController> controller_;
135 135
136 #if defined(OS_WIN) 136 #if defined(OS_WIN)
137 ui::ScopedOleInitializer ole_initializer_; 137 ui::ScopedOleInitializer ole_initializer_;
138 #endif 138 #endif
139 139
140 scoped_ptr<views::corewm::WMState> wm_state_; 140 scoped_ptr<wm::WMState> wm_state_;
141 141
142 DISALLOW_COPY_AND_ASSIGN(TooltipControllerTest); 142 DISALLOW_COPY_AND_ASSIGN(TooltipControllerTest);
143 }; 143 };
144 144
145 TEST_F(TooltipControllerTest, ViewTooltip) { 145 TEST_F(TooltipControllerTest, ViewTooltip) {
146 view_->set_tooltip_text(ASCIIToUTF16("Tooltip Text")); 146 view_->set_tooltip_text(ASCIIToUTF16("Tooltip Text"));
147 EXPECT_EQ(base::string16(), helper_->GetTooltipText()); 147 EXPECT_EQ(base::string16(), helper_->GetTooltipText());
148 EXPECT_EQ(NULL, helper_->GetTooltipWindow()); 148 EXPECT_EQ(NULL, helper_->GetTooltipWindow());
149 generator_->MoveMouseToCenterOf(GetWindow()); 149 generator_->MoveMouseToCenterOf(GetWindow());
150 150
(...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after
688 688
689 } // namespace 689 } // namespace
690 690
691 // Use for tests that don't depend upon views. 691 // Use for tests that don't depend upon views.
692 class TooltipControllerTest2 : public aura::test::AuraTestBase { 692 class TooltipControllerTest2 : public aura::test::AuraTestBase {
693 public: 693 public:
694 TooltipControllerTest2() : test_tooltip_(new TestTooltip) {} 694 TooltipControllerTest2() : test_tooltip_(new TestTooltip) {}
695 virtual ~TooltipControllerTest2() {} 695 virtual ~TooltipControllerTest2() {}
696 696
697 virtual void SetUp() OVERRIDE { 697 virtual void SetUp() OVERRIDE {
698 wm_state_.reset(new views::corewm::WMState); 698 wm_state_.reset(new wm::WMState);
699 aura::test::AuraTestBase::SetUp(); 699 aura::test::AuraTestBase::SetUp();
700 controller_.reset(new TooltipController( 700 controller_.reset(new TooltipController(
701 scoped_ptr<views::corewm::Tooltip>(test_tooltip_))); 701 scoped_ptr<corewm::Tooltip>(test_tooltip_)));
702 root_window()->AddPreTargetHandler(controller_.get()); 702 root_window()->AddPreTargetHandler(controller_.get());
703 SetTooltipClient(root_window(), controller_.get()); 703 SetTooltipClient(root_window(), controller_.get());
704 helper_.reset(new TooltipControllerTestHelper(controller_.get())); 704 helper_.reset(new TooltipControllerTestHelper(controller_.get()));
705 generator_.reset(new aura::test::EventGenerator(root_window())); 705 generator_.reset(new aura::test::EventGenerator(root_window()));
706 } 706 }
707 707
708 virtual void TearDown() OVERRIDE { 708 virtual void TearDown() OVERRIDE {
709 root_window()->RemovePreTargetHandler(controller_.get()); 709 root_window()->RemovePreTargetHandler(controller_.get());
710 aura::client::SetTooltipClient(root_window(), NULL); 710 aura::client::SetTooltipClient(root_window(), NULL);
711 controller_.reset(); 711 controller_.reset();
712 generator_.reset(); 712 generator_.reset();
713 helper_.reset(); 713 helper_.reset();
714 aura::test::AuraTestBase::TearDown(); 714 aura::test::AuraTestBase::TearDown();
715 wm_state_.reset(); 715 wm_state_.reset();
716 } 716 }
717 717
718 protected: 718 protected:
719 // Owned by |controller_|. 719 // Owned by |controller_|.
720 TestTooltip* test_tooltip_; 720 TestTooltip* test_tooltip_;
721 scoped_ptr<TooltipControllerTestHelper> helper_; 721 scoped_ptr<TooltipControllerTestHelper> helper_;
722 scoped_ptr<aura::test::EventGenerator> generator_; 722 scoped_ptr<aura::test::EventGenerator> generator_;
723 723
724 private: 724 private:
725 scoped_ptr<TooltipController> controller_; 725 scoped_ptr<TooltipController> controller_;
726 scoped_ptr<views::corewm::WMState> wm_state_; 726 scoped_ptr<wm::WMState> wm_state_;
727 727
728 DISALLOW_COPY_AND_ASSIGN(TooltipControllerTest2); 728 DISALLOW_COPY_AND_ASSIGN(TooltipControllerTest2);
729 }; 729 };
730 730
731 TEST_F(TooltipControllerTest2, VerifyLeadingTrailingWhitespaceStripped) { 731 TEST_F(TooltipControllerTest2, VerifyLeadingTrailingWhitespaceStripped) {
732 aura::test::TestWindowDelegate test_delegate; 732 aura::test::TestWindowDelegate test_delegate;
733 scoped_ptr<aura::Window> window( 733 scoped_ptr<aura::Window> window(
734 CreateNormalWindow(100, root_window(), &test_delegate)); 734 CreateNormalWindow(100, root_window(), &test_delegate));
735 window->SetBounds(gfx::Rect(0, 0, 300, 300)); 735 window->SetBounds(gfx::Rect(0, 0, 300, 300));
736 base::string16 tooltip_text(ASCIIToUTF16(" \nx ")); 736 base::string16 tooltip_text(ASCIIToUTF16(" \nx "));
(...skipping 21 matching lines...) Expand all
758 // the tooltip window is closed. 758 // the tooltip window is closed.
759 ui::CancelModeEvent event; 759 ui::CancelModeEvent event;
760 helper_->controller()->OnCancelMode(&event); 760 helper_->controller()->OnCancelMode(&event);
761 EXPECT_FALSE(helper_->IsTooltipVisible()); 761 EXPECT_FALSE(helper_->IsTooltipVisible());
762 EXPECT_TRUE(helper_->GetTooltipWindow() == NULL); 762 EXPECT_TRUE(helper_->GetTooltipWindow() == NULL);
763 } 763 }
764 764
765 } // namespace test 765 } // namespace test
766 } // namespace corewm 766 } // namespace corewm
767 } // namespace views 767 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/corewm/desktop_capture_controller_unittest.cc ('k') | ui/views/examples/content_client/examples_browser_main_parts.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698