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

Side by Side 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: 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/cocoa/dev_tools_controller.mm ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
(Empty)
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
dhollowa 2013/02/07 02:43:40 nit: no need for "(c)"
sail 2013/02/07 02:50:49 Done.
2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file.
4
5 #import "chrome/browser/ui/cocoa/dev_tools_controller.h"
6
7 #include "chrome/browser/devtools/devtools_window.h"
8 #include "chrome/browser/ui/browser.h"
9 #include "chrome/browser/ui/browser_window.h"
10 #include "chrome/browser/ui/cocoa/browser_window_controller.h"
11 #include "chrome/test/base/in_process_browser_test.h"
12
13 class DevToolsControllerTest : public InProcessBrowserTest {
14 public:
15 DevToolsControllerTest() : InProcessBrowserTest() {
16 }
17
18 virtual void SetUpOnMainThread() OVERRIDE {
19 DevToolsWindow::ToggleDevToolsWindow(browser(),
20 DEVTOOLS_TOGGLE_ACTION_SHOW);
21 }
22
23 DevToolsController* controller() {
24 NSWindow* window = browser()->window()->GetNativeWindow();
25 BrowserWindowController* window_controller =
26 [BrowserWindowController browserWindowControllerForWindow:window];
27 return [window_controller devToolsController];
28 }
29
30 void SetDockSide(DevToolsDockSide side) {
31 content::WebContents* web_contents =
32 browser()->tab_strip_model()->GetActiveWebContents();
33 DevToolsWindow* dev_tools =
34 DevToolsWindow::GetDockedInstanceForInspectedTab(web_contents);
35 dev_tools->SetDockSide(dev_tools->SideToString(side));
36 }
37
38 private:
39 DISALLOW_COPY_AND_ASSIGN(DevToolsControllerTest);
40 };
41
42 // Verify that in horizontal mode the splitter is not allowed to go past the
43 // bookmark bar.
44 IN_PROC_BROWSER_TEST_F(DevToolsControllerTest, ConstrainSplitter) {
45 [controller() setTopContentOffset:0];
46 EXPECT_EQ(0, [controller() splitView:[controller() splitView]
47 constrainSplitPosition:0
48 ofSubviewAt:0]);
49
50 CGFloat offset = 50;
51 [controller() setTopContentOffset:offset];
52 EXPECT_EQ(offset, [controller() splitView:[controller() splitView]
53 constrainSplitPosition:0
54 ofSubviewAt:0]);
55
56 // Should not be constrained in vertical mode.
57 [[controller() splitView] setVertical:NO];
58 EXPECT_EQ(0, [controller() splitView:[controller() splitView]
59 constrainSplitPosition:0
60 ofSubviewAt:0]);
61 }
62
63 // When docked to the right the dev tools view should be shrunk so that it
64 // doesn't overlap the bookmark bar.
65 IN_PROC_BROWSER_TEST_F(DevToolsControllerTest, ViewSize) {
66 EXPECT_EQ(2u, [[[controller() splitView] subviews] count]);
67 NSView* container_view = [[[controller() splitView] subviews] lastObject];
68 EXPECT_EQ(1u, [[container_view subviews] count]);
69 NSView* dev_tools_view = [[container_view subviews] lastObject];
70 CGFloat width = NSWidth([[controller() splitView] bounds]);
71 CGFloat height = NSHeight([[controller() splitView] bounds]);
72
73 SetDockSide(DEVTOOLS_DOCK_SIDE_BOTTOM);
74 EXPECT_EQ(width, NSWidth([dev_tools_view bounds]));
75
76 SetDockSide(DEVTOOLS_DOCK_SIDE_RIGHT);
77 EXPECT_EQ(height, NSHeight([dev_tools_view bounds]));
78
79 CGFloat offset = 50;
80 [controller() setTopContentOffset:offset];
81
82 SetDockSide(DEVTOOLS_DOCK_SIDE_BOTTOM);
83 EXPECT_EQ(width, NSWidth([dev_tools_view bounds]));
84
85 SetDockSide(DEVTOOLS_DOCK_SIDE_RIGHT);
86 EXPECT_EQ(height - offset, NSHeight([dev_tools_view bounds]));
87 }
OLDNEW
« 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