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

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

Issue 31043006: Moves creation of various clients to DesktopNativeWidgetAura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: resolve merge Created 7 years, 2 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 }; 69 };
70 70
71 } // namespace 71 } // namespace
72 72
73 //////////////////////////////////////////////////////////////////////////////// 73 ////////////////////////////////////////////////////////////////////////////////
74 // BrowserDesktopRootWindowHostWin, public: 74 // BrowserDesktopRootWindowHostWin, public:
75 75
76 BrowserDesktopRootWindowHostWin::BrowserDesktopRootWindowHostWin( 76 BrowserDesktopRootWindowHostWin::BrowserDesktopRootWindowHostWin(
77 views::internal::NativeWidgetDelegate* native_widget_delegate, 77 views::internal::NativeWidgetDelegate* native_widget_delegate,
78 views::DesktopNativeWidgetAura* desktop_native_widget_aura, 78 views::DesktopNativeWidgetAura* desktop_native_widget_aura,
79 const gfx::Rect& initial_bounds,
80 BrowserView* browser_view, 79 BrowserView* browser_view,
81 BrowserFrame* browser_frame) 80 BrowserFrame* browser_frame)
82 : DesktopRootWindowHostWin(native_widget_delegate, 81 : DesktopRootWindowHostWin(native_widget_delegate,
83 desktop_native_widget_aura, 82 desktop_native_widget_aura),
84 initial_bounds),
85 browser_view_(browser_view), 83 browser_view_(browser_view),
86 browser_frame_(browser_frame), 84 browser_frame_(browser_frame),
87 did_gdi_clear_(false) { 85 did_gdi_clear_(false) {
88 scoped_ptr<ui::ThemeProvider> theme_provider( 86 scoped_ptr<ui::ThemeProvider> theme_provider(
89 new DesktopThemeProvider(ThemeServiceFactory::GetForProfile( 87 new DesktopThemeProvider(ThemeServiceFactory::GetForProfile(
90 browser_view->browser()->profile()))); 88 browser_view->browser()->profile())));
91 browser_frame->SetThemeProvider(theme_provider.Pass()); 89 browser_frame->SetThemeProvider(theme_provider.Pass());
92 } 90 }
93 91
94 BrowserDesktopRootWindowHostWin::~BrowserDesktopRootWindowHostWin() { 92 BrowserDesktopRootWindowHostWin::~BrowserDesktopRootWindowHostWin() {
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 } 308 }
311 309
312 //////////////////////////////////////////////////////////////////////////////// 310 ////////////////////////////////////////////////////////////////////////////////
313 // BrowserDesktopRootWindowHost, public: 311 // BrowserDesktopRootWindowHost, public:
314 312
315 // static 313 // static
316 BrowserDesktopRootWindowHost* 314 BrowserDesktopRootWindowHost*
317 BrowserDesktopRootWindowHost::CreateBrowserDesktopRootWindowHost( 315 BrowserDesktopRootWindowHost::CreateBrowserDesktopRootWindowHost(
318 views::internal::NativeWidgetDelegate* native_widget_delegate, 316 views::internal::NativeWidgetDelegate* native_widget_delegate,
319 views::DesktopNativeWidgetAura* desktop_native_widget_aura, 317 views::DesktopNativeWidgetAura* desktop_native_widget_aura,
320 const gfx::Rect& initial_bounds,
321 BrowserView* browser_view, 318 BrowserView* browser_view,
322 BrowserFrame* browser_frame) { 319 BrowserFrame* browser_frame) {
323 return new BrowserDesktopRootWindowHostWin(native_widget_delegate, 320 return new BrowserDesktopRootWindowHostWin(native_widget_delegate,
324 desktop_native_widget_aura, 321 desktop_native_widget_aura,
325 initial_bounds,
326 browser_view, 322 browser_view,
327 browser_frame); 323 browser_frame);
328 } 324 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698