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

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

Issue 12226086: Alternate NTP: Fix dev tools layout (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') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_window.h" 9 #include "chrome/browser/ui/browser_window.h"
10 #include "chrome/browser/ui/cocoa/browser_window_controller.h" 10 #include "chrome/browser/ui/cocoa/browser_window_controller.h"
11 #include "chrome/common/url_constants.h"
11 #include "chrome/test/base/in_process_browser_test.h" 12 #include "chrome/test/base/in_process_browser_test.h"
12 13
13 class DevToolsControllerTest : public InProcessBrowserTest { 14 class DevToolsControllerTest : public InProcessBrowserTest {
14 public: 15 public:
15 DevToolsControllerTest() : InProcessBrowserTest() { 16 DevToolsControllerTest() : InProcessBrowserTest() {
16 } 17 }
17 18
18 virtual void SetUpOnMainThread() OVERRIDE { 19 virtual void SetUpOnMainThread() OVERRIDE {
19 DevToolsWindow::ToggleDevToolsWindow(browser(), 20 DevToolsWindow::ToggleDevToolsWindow(browser(),
20 DEVTOOLS_TOGGLE_ACTION_SHOW); 21 DEVTOOLS_TOGGLE_ACTION_SHOW);
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 79
79 CGFloat offset = 50; 80 CGFloat offset = 50;
80 [controller() setTopContentOffset:offset]; 81 [controller() setTopContentOffset:offset];
81 82
82 SetDockSide(DEVTOOLS_DOCK_SIDE_BOTTOM); 83 SetDockSide(DEVTOOLS_DOCK_SIDE_BOTTOM);
83 EXPECT_EQ(width, NSWidth([dev_tools_view bounds])); 84 EXPECT_EQ(width, NSWidth([dev_tools_view bounds]));
84 85
85 SetDockSide(DEVTOOLS_DOCK_SIDE_RIGHT); 86 SetDockSide(DEVTOOLS_DOCK_SIDE_RIGHT);
86 EXPECT_EQ(height - offset, NSHeight([dev_tools_view bounds])); 87 EXPECT_EQ(height - offset, NSHeight([dev_tools_view bounds]));
87 } 88 }
89
90 // Verify that the dev tool's web view is layed out correctly when docked to the
91 // right.
92 IN_PROC_BROWSER_TEST_F(DevToolsControllerTest, WebViewLayout) {
93 CGFloat offset = 50;
94 [controller() setTopContentOffset:offset];
95
96 SetDockSide(DEVTOOLS_DOCK_SIDE_RIGHT);
97 AddTabAtIndex(0,
98 GURL(chrome::kAboutBlankURL),
99 content::PAGE_TRANSITION_TYPED);
100 DevToolsWindow::ToggleDevToolsWindow(browser(), DEVTOOLS_TOGGLE_ACTION_SHOW);
101
102 NSView* container_view = [[[controller() splitView] subviews] lastObject];
103 NSView* dev_tools_view = [[container_view subviews] lastObject];
104 NSView* web_view = [[dev_tools_view subviews] lastObject];
105
106 CGFloat height = NSHeight([[controller() splitView] bounds]);
107
108 EXPECT_EQ(height - offset, NSHeight([web_view bounds]));
109 EXPECT_EQ(0, NSMinY([web_view bounds]));
110 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/dev_tools_controller.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698