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

Side by Side Diff: chrome/browser/ui/views/frame/browser_desktop_root_window_host_win.cc

Issue 146363002: Linux Aura: Use system title bar is now set by preference, not flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix build on Windows. Created 6 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
OLDNEW
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_root_window_host_win.h" 5 #include "chrome/browser/ui/views/frame/browser_desktop_root_window_host_win.h"
6 6
7 #include <dwmapi.h> 7 #include <dwmapi.h>
8 8
9 #include "chrome/browser/lifetime/application_lifetime.h" 9 #include "chrome/browser/lifetime/application_lifetime.h"
10 #include "chrome/browser/themes/theme_service.h" 10 #include "chrome/browser/themes/theme_service.h"
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 if (!views::DesktopWindowTreeHostWin::ShouldUseNativeFrame()) 257 if (!views::DesktopWindowTreeHostWin::ShouldUseNativeFrame())
258 return false; 258 return false;
259 // This function can get called when the Browser window is closed i.e. in the 259 // This function can get called when the Browser window is closed i.e. in the
260 // context of the BrowserView destructor. 260 // context of the BrowserView destructor.
261 if (!browser_view_->browser()) 261 if (!browser_view_->browser())
262 return false; 262 return false;
263 return chrome::ShouldUseNativeFrame(browser_view_, 263 return chrome::ShouldUseNativeFrame(browser_view_,
264 GetWidget()->GetThemeProvider()); 264 GetWidget()->GetThemeProvider());
265 } 265 }
266 266
267 void BrowserDesktopWindowTreeHostWin::FrameTypeChanged() { 267 void BrowserDesktopWindowTreeHostWin::FrameTypeChanged(
268 views::DesktopWindowTreeHostWin::FrameTypeChanged(); 268 views::Widget::FrameType new_type) {
269 views::DesktopWindowTreeHostWin::FrameTypeChanged(new_type);
269 did_gdi_clear_ = false; 270 did_gdi_clear_ = false;
270 } 271 }
271 272
272 //////////////////////////////////////////////////////////////////////////////// 273 ////////////////////////////////////////////////////////////////////////////////
273 // BrowserDesktopWindowTreeHostWin, private: 274 // BrowserDesktopWindowTreeHostWin, private:
274 275
275 void BrowserDesktopWindowTreeHostWin::UpdateDWMFrame() { 276 void BrowserDesktopWindowTreeHostWin::UpdateDWMFrame() {
276 // For "normal" windows on Aero, we always need to reset the glass area 277 // For "normal" windows on Aero, we always need to reset the glass area
277 // correctly, even if we're not currently showing the native frame (e.g. 278 // correctly, even if we're not currently showing the native frame (e.g.
278 // because a theme is showing), so we explicitly check for that case rather 279 // because a theme is showing), so we explicitly check for that case rather
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 BrowserDesktopWindowTreeHost::CreateBrowserDesktopWindowTreeHost( 326 BrowserDesktopWindowTreeHost::CreateBrowserDesktopWindowTreeHost(
326 views::internal::NativeWidgetDelegate* native_widget_delegate, 327 views::internal::NativeWidgetDelegate* native_widget_delegate,
327 views::DesktopNativeWidgetAura* desktop_native_widget_aura, 328 views::DesktopNativeWidgetAura* desktop_native_widget_aura,
328 BrowserView* browser_view, 329 BrowserView* browser_view,
329 BrowserFrame* browser_frame) { 330 BrowserFrame* browser_frame) {
330 return new BrowserDesktopWindowTreeHostWin(native_widget_delegate, 331 return new BrowserDesktopWindowTreeHostWin(native_widget_delegate,
331 desktop_native_widget_aura, 332 desktop_native_widget_aura,
332 browser_view, 333 browser_view,
333 browser_frame); 334 browser_frame);
334 } 335 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698