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/browser_window_controller_private.h" | 5 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h" |
6 | 6 |
7 #include <cmath> | 7 #include <cmath> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #import "base/mac/scoped_nsobject.h" | 10 #import "base/mac/scoped_nsobject.h" |
(...skipping 982 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
993 | 993 |
994 BOOL allowOverlappingViews = | 994 BOOL allowOverlappingViews = |
995 [self shouldAllowOverlappingViews:inPresentationMode]; | 995 [self shouldAllowOverlappingViews:inPresentationMode]; |
996 | 996 |
997 // The rendering path with overlapping views disabled causes bugs when | 997 // The rendering path with overlapping views disabled causes bugs when |
998 // transitioning between composited and non-composited mode. | 998 // transitioning between composited and non-composited mode. |
999 // http://crbug.com/279472 | 999 // http://crbug.com/279472 |
1000 allowOverlappingViews = YES; | 1000 allowOverlappingViews = YES; |
1001 contents->SetAllowOverlappingViews(allowOverlappingViews); | 1001 contents->SetAllowOverlappingViews(allowOverlappingViews); |
1002 | 1002 |
1003 DevToolsWindow* devToolsWindow = | 1003 WebContents* devTools = |
1004 DevToolsWindow::GetDockedInstanceForInspectedTab(contents); | 1004 DevToolsWindow::GetWebContentsToShowForInspectedTab(contents, NULL); |
1005 if (devToolsWindow) { | 1005 if (devTools) |
1006 devToolsWindow->web_contents()-> | 1006 devTools->SetAllowOverlappingViews(allowOverlappingViews); |
1007 SetAllowOverlappingViews(allowOverlappingViews); | |
1008 } | |
1009 } | 1007 } |
1010 | 1008 |
1011 - (void)updateInfoBarTipVisibility { | 1009 - (void)updateInfoBarTipVisibility { |
1012 // If there's no toolbar then hide the infobar tip. | 1010 // If there's no toolbar then hide the infobar tip. |
1013 [infoBarContainerController_ | 1011 [infoBarContainerController_ |
1014 setShouldSuppressTopInfoBarTip:![self hasToolbar]]; | 1012 setShouldSuppressTopInfoBarTip:![self hasToolbar]]; |
1015 } | 1013 } |
1016 | 1014 |
1017 @end // @implementation BrowserWindowController(Private) | 1015 @end // @implementation BrowserWindowController(Private) |
OLD | NEW |