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

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

Issue 12208060: Alternate NTP: Don't overlap dev tools with bookmark bar (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix linux Created 7 years, 10 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 | « chrome/browser/ui/cocoa/dev_tools_controller.mm ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
new file mode 100644
index 0000000000000000000000000000000000000000..f5373fe29faddec3693ff41f3ec015f14b77528a
--- /dev/null
+++ b/chrome/browser/ui/cocoa/dev_tools_controller_browsertest.mm
@@ -0,0 +1,87 @@
+// Copyright 2013 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.
+
+#import "chrome/browser/ui/cocoa/dev_tools_controller.h"
+
+#include "chrome/browser/devtools/devtools_window.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/cocoa/browser_window_controller.h"
+#include "chrome/test/base/in_process_browser_test.h"
+
+class DevToolsControllerTest : public InProcessBrowserTest {
+ public:
+ DevToolsControllerTest() : InProcessBrowserTest() {
+ }
+
+ virtual void SetUpOnMainThread() OVERRIDE {
+ DevToolsWindow::ToggleDevToolsWindow(browser(),
+ 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]);
+
+ SetDockSide(DEVTOOLS_DOCK_SIDE_BOTTOM);
+ EXPECT_EQ(width, NSWidth([dev_tools_view bounds]));
+
+ SetDockSide(DEVTOOLS_DOCK_SIDE_RIGHT);
+ EXPECT_EQ(height, NSHeight([dev_tools_view bounds]));
+
+ 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 - offset, NSHeight([dev_tools_view bounds]));
+}
« no previous file with comments | « chrome/browser/ui/cocoa/dev_tools_controller.mm ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698