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/process/process_handle.h" | 9 #include "base/process/process_handle.h" |
10 #include "base/win/windows_version.h" | |
10 #include "chrome/browser/lifetime/application_lifetime.h" | 11 #include "chrome/browser/lifetime/application_lifetime.h" |
11 #include "chrome/browser/themes/theme_service.h" | 12 #include "chrome/browser/themes/theme_service.h" |
12 #include "chrome/browser/themes/theme_service_factory.h" | 13 #include "chrome/browser/themes/theme_service_factory.h" |
13 #include "chrome/browser/ui/views/frame/browser_frame.h" | 14 #include "chrome/browser/ui/views/frame/browser_frame.h" |
14 #include "chrome/browser/ui/views/frame/browser_frame_common_win.h" | 15 #include "chrome/browser/ui/views/frame/browser_frame_common_win.h" |
15 #include "chrome/browser/ui/views/frame/browser_view.h" | 16 #include "chrome/browser/ui/views/frame/browser_view.h" |
16 #include "chrome/browser/ui/views/frame/browser_window_property_manager_win.h" | 17 #include "chrome/browser/ui/views/frame/browser_window_property_manager_win.h" |
17 #include "chrome/browser/ui/views/frame/system_menu_insertion_delegate_win.h" | 18 #include "chrome/browser/ui/views/frame/system_menu_insertion_delegate_win.h" |
18 #include "chrome/browser/ui/views/tabs/tab_strip.h" | 19 #include "chrome/browser/ui/views/tabs/tab_strip.h" |
19 #include "chrome/browser/ui/views/theme_image_mapper.h" | 20 #include "chrome/browser/ui/views/theme_image_mapper.h" |
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
336 margins.cyTopHeight = kClientEdgeThickness + 1; | 337 margins.cyTopHeight = kClientEdgeThickness + 1; |
337 } | 338 } |
338 // In maximized mode, we only have a titlebar strip of glass, no side/bottom | 339 // In maximized mode, we only have a titlebar strip of glass, no side/bottom |
339 // borders. | 340 // borders. |
340 if (!browser_view_->IsFullscreen()) { | 341 if (!browser_view_->IsFullscreen()) { |
341 gfx::Rect tabstrip_bounds( | 342 gfx::Rect tabstrip_bounds( |
342 browser_frame_->GetBoundsForTabStrip(browser_view_->tabstrip())); | 343 browser_frame_->GetBoundsForTabStrip(browser_view_->tabstrip())); |
343 tabstrip_bounds = gfx::win::DIPToScreenRect(tabstrip_bounds); | 344 tabstrip_bounds = gfx::win::DIPToScreenRect(tabstrip_bounds); |
344 margins.cyTopHeight = tabstrip_bounds.bottom() + kDWMFrameTopOffset; | 345 margins.cyTopHeight = tabstrip_bounds.bottom() + kDWMFrameTopOffset; |
345 } | 346 } |
347 if (base::win::GetVersion() >= base::win::VERSION_WIN10) { | |
Peter Kasting
2015/06/25 23:34:12
Nit: I think this might be clearer if instead of d
scottmg
2015/06/26 18:29:32
Done.
| |
348 // No inset on Win10. | |
349 margins.cxLeftWidth = 0; | |
350 margins.cxRightWidth = 0; | |
351 margins.cyBottomHeight = 0; | |
352 } | |
346 } | 353 } |
347 return margins; | 354 return margins; |
348 } | 355 } |
349 | 356 |
350 //////////////////////////////////////////////////////////////////////////////// | 357 //////////////////////////////////////////////////////////////////////////////// |
351 // BrowserDesktopWindowTreeHost, public: | 358 // BrowserDesktopWindowTreeHost, public: |
352 | 359 |
353 // static | 360 // static |
354 BrowserDesktopWindowTreeHost* | 361 BrowserDesktopWindowTreeHost* |
355 BrowserDesktopWindowTreeHost::CreateBrowserDesktopWindowTreeHost( | 362 BrowserDesktopWindowTreeHost::CreateBrowserDesktopWindowTreeHost( |
356 views::internal::NativeWidgetDelegate* native_widget_delegate, | 363 views::internal::NativeWidgetDelegate* native_widget_delegate, |
357 views::DesktopNativeWidgetAura* desktop_native_widget_aura, | 364 views::DesktopNativeWidgetAura* desktop_native_widget_aura, |
358 BrowserView* browser_view, | 365 BrowserView* browser_view, |
359 BrowserFrame* browser_frame) { | 366 BrowserFrame* browser_frame) { |
360 return new BrowserDesktopWindowTreeHostWin(native_widget_delegate, | 367 return new BrowserDesktopWindowTreeHostWin(native_widget_delegate, |
361 desktop_native_widget_aura, | 368 desktop_native_widget_aura, |
362 browser_view, | 369 browser_view, |
363 browser_frame); | 370 browser_frame); |
364 } | 371 } |
OLD | NEW |