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

Unified Diff: ui/views/focus/focus_manager_test.cc

Issue 444583002: MacViews: Get widget_interactive_uitest compiling on Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Try FocusListener Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/focus/focus_manager_test.h ('k') | ui/views/focus/focus_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/focus/focus_manager_test.cc
diff --git a/ui/views/focus/focus_manager_test.cc b/ui/views/focus/focus_manager_test.cc
deleted file mode 100644
index 6debc794dff9abb9b266e1872839442b77222c5c..0000000000000000000000000000000000000000
--- a/ui/views/focus/focus_manager_test.cc
+++ /dev/null
@@ -1,143 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ui/views/focus/focus_manager_test.h"
-
-#include <algorithm>
-
-#include "ui/views/focus/focus_manager.h"
-#include "ui/views/widget/widget.h"
-
-namespace views {
-
-////////////////////////////////////////////////////////////////////////////////
-// FocusManagerTest, public:
-
-FocusManagerTest::FocusManagerTest()
- : contents_view_(new View),
- focus_change_listener_(NULL),
- widget_focus_change_listener_(NULL) {
-}
-
-FocusManagerTest::~FocusManagerTest() {
-}
-
-FocusManager* FocusManagerTest::GetFocusManager() {
- return GetWidget()->GetFocusManager();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// FocusManagerTest, ViewTestBase overrides:
-
-void FocusManagerTest::SetUp() {
- ViewsTestBase::SetUp();
-
- Widget* widget = new Widget;
- Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW);
- params.delegate = this;
- params.bounds = gfx::Rect(0, 0, 1024, 768);
- widget->Init(params);
-
- InitContentView();
- widget->Show();
-}
-
-void FocusManagerTest::TearDown() {
- if (focus_change_listener_)
- GetFocusManager()->RemoveFocusChangeListener(focus_change_listener_);
- if (widget_focus_change_listener_) {
- WidgetFocusManager::GetInstance()->RemoveFocusChangeListener(
- widget_focus_change_listener_);
- }
- GetWidget()->Close();
-
- // Flush the message loop to make application verifiers happy.
- RunPendingMessages();
- ViewsTestBase::TearDown();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// FocusManagerTest, WidgetDelegate implementation:
-
-View* FocusManagerTest::GetContentsView() {
- return contents_view_;
-}
-
-Widget* FocusManagerTest::GetWidget() {
- return contents_view_->GetWidget();
-}
-
-const Widget* FocusManagerTest::GetWidget() const {
- return contents_view_->GetWidget();
-}
-
-void FocusManagerTest::GetAccessiblePanes(std::vector<View*>* panes) {
- std::copy(accessible_panes_.begin(), accessible_panes_.end(),
- std::back_inserter(*panes));
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// FocusManagerTest, protected:
-
-void FocusManagerTest::InitContentView() {
-}
-
-void FocusManagerTest::AddFocusChangeListener(FocusChangeListener* listener) {
- ASSERT_FALSE(focus_change_listener_);
- focus_change_listener_ = listener;
- GetFocusManager()->AddFocusChangeListener(listener);
-}
-
-void FocusManagerTest::AddWidgetFocusChangeListener(
- WidgetFocusChangeListener* listener) {
- ASSERT_FALSE(widget_focus_change_listener_);
- widget_focus_change_listener_ = listener;
- WidgetFocusManager::GetInstance()->AddFocusChangeListener(listener);
-}
-
-void FocusManagerTest::SetAccessiblePanes(const std::vector<View*>& panes) {
- accessible_panes_ = panes;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// TestFocusChangeListener
-
-TestFocusChangeListener::TestFocusChangeListener() {
-}
-
-TestFocusChangeListener::~TestFocusChangeListener() {
-}
-
-void TestFocusChangeListener::OnWillChangeFocus(View* focused_before,
- View* focused_now) {
- focus_changes_.push_back(ViewPair(focused_before, focused_now));
-}
-void TestFocusChangeListener::OnDidChangeFocus(View* focused_before,
- View* focused_now) {
-}
-
-void TestFocusChangeListener::ClearFocusChanges() {
- focus_changes_.clear();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// TestWidgetFocusChangeListener
-
-TestWidgetFocusChangeListener::TestWidgetFocusChangeListener() {
-}
-
-TestWidgetFocusChangeListener::~TestWidgetFocusChangeListener() {
-}
-
-void TestWidgetFocusChangeListener::ClearFocusChanges() {
- focus_changes_.clear();
-}
-
-void TestWidgetFocusChangeListener::OnNativeFocusChange(
- gfx::NativeView focused_before,
- gfx::NativeView focused_now) {
- focus_changes_.push_back(NativeViewPair(focused_before, focused_now));
-}
-
-} // namespace views
« no previous file with comments | « ui/views/focus/focus_manager_test.h ('k') | ui/views/focus/focus_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698