| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include <Cocoa/Cocoa.h> | 9 #include <Cocoa/Cocoa.h> |
| 10 | 10 |
| 11 #include "chrome/browser/browser_process.h" | 11 #include "chrome/browser/browser_process.h" |
| 12 #include "chrome/browser/debugger/devtools_window.h" | 12 #include "chrome/browser/debugger/devtools_window.h" |
| 13 #include "chrome/browser/prefs/pref_service.h" | 13 #include "chrome/browser/prefs/pref_service.h" |
| 14 #include "chrome/browser/profiles/profile.h" | 14 #include "chrome/browser/profiles/profile.h" |
| 15 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 15 #include "chrome/browser/ui/tab_contents/tab_contents.h" |
| 16 #import "chrome/browser/ui/cocoa/view_id_util.h" | 16 #import "chrome/browser/ui/cocoa/view_id_util.h" |
| 17 #include "chrome/common/pref_names.h" | 17 #include "chrome/common/pref_names.h" |
| 18 #include "content/public/browser/web_contents.h" | 18 #include "content/public/browser/web_contents.h" |
| 19 | 19 |
| 20 using content::WebContents; | 20 using content::WebContents; |
| 21 | 21 |
| 22 namespace { | 22 namespace { |
| 23 | 23 |
| 24 // Minimal height of devtools pane or content pane when devtools are docked | 24 // Minimal height of devtools pane or content pane when devtools are docked |
| 25 // to the browser window. | 25 // to the browser window. |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 return splitView_.get(); | 75 return splitView_.get(); |
| 76 } | 76 } |
| 77 | 77 |
| 78 - (NSSplitView*)splitView { | 78 - (NSSplitView*)splitView { |
| 79 return splitView_.get(); | 79 return splitView_.get(); |
| 80 } | 80 } |
| 81 | 81 |
| 82 - (void)updateDevToolsForWebContents:(WebContents*)contents | 82 - (void)updateDevToolsForWebContents:(WebContents*)contents |
| 83 withProfile:(Profile*)profile { | 83 withProfile:(Profile*)profile { |
| 84 // Get current devtools content. | 84 // Get current devtools content. |
| 85 TabContentsWrapper* devToolsTab = contents ? | 85 TabContents* devToolsTab = contents ? |
| 86 DevToolsWindow::GetDevToolsContents(contents) : NULL; | 86 DevToolsWindow::GetDevToolsContents(contents) : NULL; |
| 87 WebContents* devToolsContents = devToolsTab ? | 87 WebContents* devToolsContents = devToolsTab ? |
| 88 devToolsTab->web_contents() : NULL; | 88 devToolsTab->web_contents() : NULL; |
| 89 | 89 |
| 90 [self showDevToolsContents:devToolsContents withProfile:profile]; | 90 [self showDevToolsContents:devToolsContents withProfile:profile]; |
| 91 } | 91 } |
| 92 | 92 |
| 93 - (void)setDockToRight:(BOOL)dockToRight | 93 - (void)setDockToRight:(BOOL)dockToRight |
| 94 withProfile:(Profile*)profile { | 94 withProfile:(Profile*)profile { |
| 95 if (dockToRight_ == dockToRight) | 95 if (dockToRight_ == dockToRight) |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 226 if ([[splitView_ subviews] indexOfObject:subview] == 1) | 226 if ([[splitView_ subviews] indexOfObject:subview] == 1) |
| 227 return NO; | 227 return NO; |
| 228 return YES; | 228 return YES; |
| 229 } | 229 } |
| 230 | 230 |
| 231 -(void)splitViewWillResizeSubviews:(NSNotification *)notification { | 231 -(void)splitViewWillResizeSubviews:(NSNotification *)notification { |
| 232 [[splitView_ window] disableScreenUpdatesUntilFlush]; | 232 [[splitView_ window] disableScreenUpdatesUntilFlush]; |
| 233 } | 233 } |
| 234 | 234 |
| 235 @end | 235 @end |
| OLD | NEW |