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

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

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 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_ROOT_WINDOW_HOST_WIN_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_ROOT_WINDOW_HOST_WIN_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_ROOT_WINDOW_HOST_WIN_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_ROOT_WINDOW_HOST_WIN_H_
7 7
8 #include <windows.h> 8 #include <windows.h>
9 #include <uxtheme.h> 9 #include <uxtheme.h>
10 10
11 #include "ui/views/widget/desktop_aura/desktop_root_window_host_win.h" 11 #include "ui/views/widget/desktop_aura/desktop_root_window_host_win.h"
12 #include "chrome/browser/ui/views/frame/browser_desktop_root_window_host.h" 12 #include "chrome/browser/ui/views/frame/browser_desktop_root_window_host.h"
13 #include "chrome/browser/ui/views/frame/minimize_button_metrics_win.h" 13 #include "chrome/browser/ui/views/frame/minimize_button_metrics_win.h"
14 14
15 class BrowserFrame; 15 class BrowserFrame;
16 class BrowserView; 16 class BrowserView;
17 17
18 namespace views { 18 namespace views {
19 class DesktopNativeWidgetAura; 19 class DesktopNativeWidgetAura;
20 class NativeMenuWin; 20 class NativeMenuWin;
21 } 21 }
22 22
23 class BrowserDesktopRootWindowHostWin : public BrowserDesktopRootWindowHost, 23 class BrowserDesktopRootWindowHostWin : public BrowserDesktopRootWindowHost,
24 public views::DesktopRootWindowHostWin { 24 public views::DesktopRootWindowHostWin {
25 public: 25 public:
26 BrowserDesktopRootWindowHostWin( 26 BrowserDesktopRootWindowHostWin(
27 views::internal::NativeWidgetDelegate* native_widget_delegate, 27 views::internal::NativeWidgetDelegate* native_widget_delegate,
28 views::DesktopNativeWidgetAura* desktop_native_widget_aura, 28 views::DesktopNativeWidgetAura* desktop_native_widget_aura,
29 const gfx::Rect& initial_bounds,
30 BrowserView* browser_view, 29 BrowserView* browser_view,
31 BrowserFrame* browser_frame); 30 BrowserFrame* browser_frame);
32 virtual ~BrowserDesktopRootWindowHostWin(); 31 virtual ~BrowserDesktopRootWindowHostWin();
33 32
34 private: 33 private:
35 views::NativeMenuWin* GetSystemMenu(); 34 views::NativeMenuWin* GetSystemMenu();
36 35
37 // Overridden from BrowserDesktopRootWindowHost: 36 // Overridden from BrowserDesktopRootWindowHost:
38 virtual DesktopRootWindowHost* AsDesktopRootWindowHost() OVERRIDE; 37 virtual DesktopRootWindowHost* AsDesktopRootWindowHost() OVERRIDE;
39 virtual int GetMinimizeButtonOffset() const OVERRIDE; 38 virtual int GetMinimizeButtonOffset() const OVERRIDE;
(...skipping 27 matching lines...) Expand all
67 scoped_ptr<views::NativeMenuWin> system_menu_; 66 scoped_ptr<views::NativeMenuWin> system_menu_;
68 67
69 // Necessary to avoid corruption on NC paint in Aero mode. 68 // Necessary to avoid corruption on NC paint in Aero mode.
70 bool did_gdi_clear_; 69 bool did_gdi_clear_;
71 70
72 DISALLOW_COPY_AND_ASSIGN(BrowserDesktopRootWindowHostWin); 71 DISALLOW_COPY_AND_ASSIGN(BrowserDesktopRootWindowHostWin);
73 }; 72 };
74 73
75 74
76 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_ROOT_WINDOW_HOST_WIN_H_ 75 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_ROOT_WINDOW_HOST_WIN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698