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

Unified Diff: ui/aura/root_window_host_win.h

Issue 10241005: Make win_aura work without ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: ui/aura/root_window_host_win.h
===================================================================
--- ui/aura/root_window_host_win.h (revision 134107)
+++ ui/aura/root_window_host_win.h (working copy)
@@ -10,6 +10,10 @@
#include "ui/aura/root_window_host.h"
#include "ui/base/win/window_impl.h"
+namespace ui {
+class ViewProp;
+}
+
namespace aura {
class RootWindowHostWin : public RootWindowHost, public ui::WindowImpl {
@@ -19,6 +23,7 @@
// RootWindowHost:
virtual void SetRootWindow(RootWindow* root_window) OVERRIDE;
+ virtual RootWindow* GetRootWindow() OVERRIDE;
virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE;
virtual void Show() OVERRIDE;
virtual void ToggleFullScreen() OVERRIDE;
@@ -74,6 +79,8 @@
DWORD saved_window_style_;
DWORD saved_window_ex_style_;
+ scoped_ptr<ui::ViewProp> prop_;
+
DISALLOW_COPY_AND_ASSIGN(RootWindowHostWin);
};

Powered by Google App Engine
This is Rietveld 408576698