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

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

Issue 13006019: Revert 190584 "Alternate NTP Mac: Show overlay at fixed position" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 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 side-by-side diff with in-line comments
Download patch
Index: trunk/src/chrome/browser/ui/cocoa/dev_tools_controller_browsertest.mm
===================================================================
--- trunk/src/chrome/browser/ui/cocoa/dev_tools_controller_browsertest.mm (revision 190730)
+++ trunk/src/chrome/browser/ui/cocoa/dev_tools_controller_browsertest.mm (working copy)
@@ -6,7 +6,6 @@
#include "chrome/browser/devtools/devtools_window.h"
#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/browser_window.h"
#include "chrome/browser/ui/cocoa/browser_window_controller.h"
#include "chrome/common/url_constants.h"
@@ -71,22 +70,21 @@
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]));
+ EXPECT_EQ(height, NSHeight([dev_tools_view bounds]));
- CGFloat new_offset = 50;
- [controller() setTopContentOffset:new_offset];
+ CGFloat offset = 50;
+ [controller() setTopContentOffset: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]));
+ EXPECT_EQ(height - offset, NSHeight([dev_tools_view bounds]));
}
// Verify that the dev tool's web view is layed out correctly when docked to the
@@ -116,18 +114,3 @@
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::HOST_DESKTOP_TYPE_NATIVE);
- 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]);
-}

Powered by Google App Engine
This is Rietveld 408576698