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

Side by Side Diff: chrome/browser/ui/cocoa/dev_tools_controller_browsertest.mm

Issue 16174003: Make all tests use GetActiveDesktop() instead of hardcoding HOST_DESKTOP_TYPE_NATIVE. (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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 #import "chrome/browser/ui/cocoa/dev_tools_controller.h" 5 #import "chrome/browser/ui/cocoa/dev_tools_controller.h"
6 6
7 #include "chrome/browser/devtools/devtools_window.h" 7 #include "chrome/browser/devtools/devtools_window.h"
8 #include "chrome/browser/ui/browser.h" 8 #include "chrome/browser/ui/browser.h"
9 #include "chrome/browser/ui/browser_list.h" 9 #include "chrome/browser/ui/browser_list.h"
10 #include "chrome/browser/ui/browser_window.h" 10 #include "chrome/browser/ui/browser_window.h"
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 // Update the offset and verify that the view is resized. 116 // Update the offset and verify that the view is resized.
117 CGFloat new_offset = 25; 117 CGFloat new_offset = 25;
118 [controller() setTopContentOffset:new_offset]; 118 [controller() setTopContentOffset:new_offset];
119 EXPECT_EQ(height - new_offset, NSHeight([web_view bounds])); 119 EXPECT_EQ(height - new_offset, NSHeight([web_view bounds]));
120 EXPECT_EQ(0, NSMinY([web_view bounds])); 120 EXPECT_EQ(0, NSMinY([web_view bounds]));
121 } 121 }
122 122
123 // Verify that the dev tools undocked window is layed out correctly. 123 // Verify that the dev tools undocked window is layed out correctly.
124 IN_PROC_BROWSER_TEST_F(DevToolsControllerTest, UndockedOffset) { 124 IN_PROC_BROWSER_TEST_F(DevToolsControllerTest, UndockedOffset) {
125 BrowserList* browser_list = 125 BrowserList* browser_list =
126 BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_NATIVE); 126 BrowserList::GetInstance(chrome::GetActiveDesktop());
127 EXPECT_EQ(1u, browser_list->size()); 127 EXPECT_EQ(1u, browser_list->size());
128 SetDockSide(DEVTOOLS_DOCK_SIDE_UNDOCKED); 128 SetDockSide(DEVTOOLS_DOCK_SIDE_UNDOCKED);
129 EXPECT_EQ(2u, browser_list->size()); 129 EXPECT_EQ(2u, browser_list->size());
130 130
131 Browser* dev_tools_browser = browser_list->get(1); 131 Browser* dev_tools_browser = browser_list->get(1);
132 BrowserWindowController* window_controller = 132 BrowserWindowController* window_controller =
133 [BrowserWindowController browserWindowControllerForWindow: 133 [BrowserWindowController browserWindowControllerForWindow:
134 dev_tools_browser->window()->GetNativeWindow()]; 134 dev_tools_browser->window()->GetNativeWindow()];
135 EXPECT_EQ(0.0, [[window_controller devToolsController] topContentOffset]); 135 EXPECT_EQ(0.0, [[window_controller devToolsController] topContentOffset]);
136 } 136 }
(...skipping 11 matching lines...) Expand all
148 EXPECT_FALSE(dev_tools_view->GetAllowOverlappingViews()); 148 EXPECT_FALSE(dev_tools_view->GetAllowOverlappingViews());
149 149
150 // With the find bar. 150 // With the find bar.
151 browser()->GetFindBarController()->find_bar()->Show(false); 151 browser()->GetFindBarController()->find_bar()->Show(false);
152 EXPECT_TRUE(dev_tools_view->GetAllowOverlappingViews()); 152 EXPECT_TRUE(dev_tools_view->GetAllowOverlappingViews());
153 153
154 // Without the find bar. 154 // Without the find bar.
155 browser()->GetFindBarController()->find_bar()->Hide(false); 155 browser()->GetFindBarController()->find_bar()->Hide(false);
156 EXPECT_FALSE(dev_tools_view->GetAllowOverlappingViews()); 156 EXPECT_FALSE(dev_tools_view->GetAllowOverlappingViews());
157 } 157 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/cocoa_profile_test.mm ('k') | chrome/browser/ui/cocoa/notifications/balloon_controller_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698