summaryrefslogtreecommitdiffstats
path: root/views/focus/focus_manager_unittest.cc
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-04 21:04:39 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-04 21:04:39 +0000
commit5b54a5c0327ea3ac2c13cff37573ccd4e7f41e57 (patch)
treee6137bcd166e3a5b83dbdc4a997099597dd7d82f /views/focus/focus_manager_unittest.cc
parent6775e40aeb887f15dc9182b250cdc4100aa79ce0 (diff)
downloadchromium_src-5b54a5c0327ea3ac2c13cff37573ccd4e7f41e57.zip
chromium_src-5b54a5c0327ea3ac2c13cff37573ccd4e7f41e57.tar.gz
chromium_src-5b54a5c0327ea3ac2c13cff37573ccd4e7f41e57.tar.bz2
Two things:
- simplify root view sizing. - move focus manager creation/management to Widget BUG=72040 TEST=existing unittests Review URL: http://codereview.chromium.org/6609026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76963 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/focus/focus_manager_unittest.cc')
-rw-r--r--views/focus/focus_manager_unittest.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/views/focus/focus_manager_unittest.cc b/views/focus/focus_manager_unittest.cc
index 24d2dd7..bcf2b94 100644
--- a/views/focus/focus_manager_unittest.cc
+++ b/views/focus/focus_manager_unittest.cc
@@ -1677,11 +1677,9 @@ class FocusManagerDtorTest : public FocusManagerTest {
dtor_tracker_(dtor_tracker) {
tracked_focus_manager_ = new FocusManagerDtorTracked(this,
dtor_tracker_);
- // Replace focus_manager_ with FocusManagerDtorTracked
- set_focus_manager(tracked_focus_manager_);
-
GetNonClientView()->SetFrameView(CreateFrameViewForWindow());
InitWindow(NULL, gfx::Rect(0, 0, 100, 100));
+ ReplaceFocusManager(tracked_focus_manager_);
}
virtual ~WindowGtkDtorTracked() {