| 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 #include "chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.h" | 5 #include "chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.h" |
| 6 | 6 |
| 7 #include <dwmapi.h> | 7 #include <dwmapi.h> |
| 8 | 8 |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/process/process_handle.h" | 10 #include "base/process/process_handle.h" |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 // frame. | 87 // frame. |
| 88 if (!GetWidget()->ShouldUseNativeFrame() || | 88 if (!GetWidget()->ShouldUseNativeFrame() || |
| 89 !browser_view_->IsBrowserTypeNormal()) { | 89 !browser_view_->IsBrowserTypeNormal()) { |
| 90 return false; | 90 return false; |
| 91 } | 91 } |
| 92 | 92 |
| 93 if (GetWidget()->IsFullscreen()) { | 93 if (GetWidget()->IsFullscreen()) { |
| 94 // In fullscreen mode there is no frame. | 94 // In fullscreen mode there is no frame. |
| 95 *insets = gfx::Insets(); | 95 *insets = gfx::Insets(); |
| 96 } else { | 96 } else { |
| 97 const int frame_thickness = GetSystemMetrics(SM_CXSIZEFRAME); | 97 const int frame_thickness = |
| 98 display::win::ScreenWin::GetSystemMetricsForHwnd( |
| 99 GetHWND(), SM_CXSIZEFRAME); |
| 98 // Reduce the Windows non-client border size because we extend the border | 100 // Reduce the Windows non-client border size because we extend the border |
| 99 // into our client area in UpdateDWMFrame(). | 101 // into our client area in UpdateDWMFrame(). |
| 100 *insets = gfx::Insets(0, frame_thickness, frame_thickness, | 102 *insets = gfx::Insets(0, frame_thickness, frame_thickness, |
| 101 frame_thickness) - GetClientEdgeThicknesses(); | 103 frame_thickness) - GetClientEdgeThicknesses(); |
| 102 } | 104 } |
| 103 return true; | 105 return true; |
| 104 } | 106 } |
| 105 | 107 |
| 106 void BrowserDesktopWindowTreeHostWin::HandleCreate() { | 108 void BrowserDesktopWindowTreeHostWin::HandleCreate() { |
| 107 DesktopWindowTreeHostWin::HandleCreate(); | 109 DesktopWindowTreeHostWin::HandleCreate(); |
| (...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 318 BrowserDesktopWindowTreeHost::CreateBrowserDesktopWindowTreeHost( | 320 BrowserDesktopWindowTreeHost::CreateBrowserDesktopWindowTreeHost( |
| 319 views::internal::NativeWidgetDelegate* native_widget_delegate, | 321 views::internal::NativeWidgetDelegate* native_widget_delegate, |
| 320 views::DesktopNativeWidgetAura* desktop_native_widget_aura, | 322 views::DesktopNativeWidgetAura* desktop_native_widget_aura, |
| 321 BrowserView* browser_view, | 323 BrowserView* browser_view, |
| 322 BrowserFrame* browser_frame) { | 324 BrowserFrame* browser_frame) { |
| 323 return new BrowserDesktopWindowTreeHostWin(native_widget_delegate, | 325 return new BrowserDesktopWindowTreeHostWin(native_widget_delegate, |
| 324 desktop_native_widget_aura, | 326 desktop_native_widget_aura, |
| 325 browser_view, | 327 browser_view, |
| 326 browser_frame); | 328 browser_frame); |
| 327 } | 329 } |
| OLD | NEW |