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

Unified Diff: chrome/browser/ui/cocoa/dev_tools_controller_browsertest.mm

Issue 18009003: Instant Extended: Delete unused overlay code (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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/dev_tools_controller_browsertest.mm
diff --git a/chrome/browser/ui/cocoa/dev_tools_controller_browsertest.mm b/chrome/browser/ui/cocoa/dev_tools_controller_browsertest.mm
index 8d81d0aea057d973d6343e010634d3fc337a7e7e..cffd2a78f33e16f0e51bcb7869a87389a46e8899 100644
--- a/chrome/browser/ui/cocoa/dev_tools_controller_browsertest.mm
+++ b/chrome/browser/ui/cocoa/dev_tools_controller_browsertest.mm
@@ -26,115 +26,10 @@ class DevToolsControllerTest : public InProcessBrowserTest {
DEVTOOLS_TOGGLE_ACTION_SHOW);
}
- DevToolsController* controller() {
- NSWindow* window = browser()->window()->GetNativeWindow();
- BrowserWindowController* window_controller =
- [BrowserWindowController browserWindowControllerForWindow:window];
- return [window_controller devToolsController];
- }
-
- void SetDockSide(DevToolsDockSide side) {
- content::WebContents* web_contents =
- browser()->tab_strip_model()->GetActiveWebContents();
- DevToolsWindow* dev_tools =
- DevToolsWindow::GetDockedInstanceForInspectedTab(web_contents);
- dev_tools->SetDockSide(dev_tools->SideToString(side));
- }
-
private:
DISALLOW_COPY_AND_ASSIGN(DevToolsControllerTest);
};
-// Verify that in horizontal mode the splitter is not allowed to go past the
-// bookmark bar.
-IN_PROC_BROWSER_TEST_F(DevToolsControllerTest, ConstrainSplitter) {
- [controller() setTopContentOffset:0];
- EXPECT_EQ(0, [controller() splitView:[controller() splitView]
- constrainSplitPosition:0
- ofSubviewAt:0]);
-
- CGFloat offset = 50;
- [controller() setTopContentOffset:offset];
- EXPECT_EQ(offset, [controller() splitView:[controller() splitView]
- constrainSplitPosition:0
- ofSubviewAt:0]);
-
- // Should not be constrained in vertical mode.
- [[controller() splitView] setVertical:YES];
- EXPECT_EQ(0, [controller() splitView:[controller() splitView]
- constrainSplitPosition:0
- ofSubviewAt:0]);
-}
-
-// When docked to the right the dev tools view should be shrunk so that it
-// doesn't overlap the bookmark bar.
-IN_PROC_BROWSER_TEST_F(DevToolsControllerTest, ViewSize) {
- EXPECT_EQ(2u, [[[controller() splitView] subviews] count]);
- NSView* container_view = [[[controller() splitView] subviews] lastObject];
- EXPECT_EQ(1u, [[container_view subviews] count]);
- NSView* dev_tools_view = [[container_view subviews] lastObject];
- CGFloat width = NSWidth([[controller() splitView] bounds]);
- CGFloat height = NSHeight([[controller() splitView] bounds]);
- CGFloat offset = [controller() topContentOffset];
-
- SetDockSide(DEVTOOLS_DOCK_SIDE_BOTTOM);
- EXPECT_EQ(width, NSWidth([dev_tools_view bounds]));
-
- SetDockSide(DEVTOOLS_DOCK_SIDE_RIGHT);
- EXPECT_EQ(height - offset, NSHeight([dev_tools_view bounds]));
-
- CGFloat new_offset = 50;
- [controller() setTopContentOffset:new_offset];
-
- SetDockSide(DEVTOOLS_DOCK_SIDE_BOTTOM);
- EXPECT_EQ(width, NSWidth([dev_tools_view bounds]));
-
- SetDockSide(DEVTOOLS_DOCK_SIDE_RIGHT);
- EXPECT_EQ(height - new_offset, NSHeight([dev_tools_view bounds]));
-}
-
-// Verify that the dev tool's web view is layed out correctly when docked to the
-// right.
-IN_PROC_BROWSER_TEST_F(DevToolsControllerTest, WebViewLayout) {
- CGFloat offset = 50;
- [controller() setTopContentOffset:offset];
-
- SetDockSide(DEVTOOLS_DOCK_SIDE_RIGHT);
- AddTabAtIndex(
- 0, GURL(content::kAboutBlankURL), content::PAGE_TRANSITION_TYPED);
- DevToolsWindow::ToggleDevToolsWindow(browser(), DEVTOOLS_TOGGLE_ACTION_SHOW);
-
- NSView* container_view = [[[controller() splitView] subviews] lastObject];
- NSView* dev_tools_view = [[container_view subviews] lastObject];
- NSView* web_view = [[dev_tools_view subviews] lastObject];
-
- CGFloat height = NSHeight([[controller() splitView] bounds]);
-
- EXPECT_EQ(height - offset, NSHeight([web_view bounds]));
- EXPECT_EQ(0, NSMinY([web_view bounds]));
-
- // Update the offset and verify that the view is resized.
- CGFloat new_offset = 25;
- [controller() setTopContentOffset:new_offset];
- EXPECT_EQ(height - new_offset, NSHeight([web_view bounds]));
- EXPECT_EQ(0, NSMinY([web_view bounds]));
-}
-
-// Verify that the dev tools undocked window is layed out correctly.
-IN_PROC_BROWSER_TEST_F(DevToolsControllerTest, UndockedOffset) {
- BrowserList* browser_list =
- BrowserList::GetInstance(chrome::GetActiveDesktop());
- EXPECT_EQ(1u, browser_list->size());
- SetDockSide(DEVTOOLS_DOCK_SIDE_UNDOCKED);
- EXPECT_EQ(2u, browser_list->size());
-
- Browser* dev_tools_browser = browser_list->get(1);
- BrowserWindowController* window_controller =
- [BrowserWindowController browserWindowControllerForWindow:
- dev_tools_browser->window()->GetNativeWindow()];
- EXPECT_EQ(0.0, [[window_controller devToolsController] topContentOffset]);
-}
-
// Verify that AllowOverlappingViews is set while the find bar is visible.
IN_PROC_BROWSER_TEST_F(DevToolsControllerTest, AllowOverlappingViews) {
content::WebContents* web_contents =

Powered by Google App Engine
This is Rietveld 408576698