Index: views/desktop/desktop_window.h |
=================================================================== |
--- views/desktop/desktop_window.h (revision 89890) |
+++ views/desktop/desktop_window.h (working copy) |
@@ -15,17 +15,22 @@ |
class DesktopWindow : public WidgetDelegateView { |
public: |
- static DesktopWindow* desktop_window; |
+ static DesktopWindow* desktop_window; |
- DesktopWindow(); |
- virtual ~DesktopWindow(); |
+ DesktopWindow(); |
+ virtual ~DesktopWindow(); |
- static void CreateDesktopWindow(); |
+ static void CreateDesktopWindow(); |
- // Changes activation to the specified Widget. The currently active Widget |
- // is de-activated. |
- void ActivateWidget(Widget* widget); |
+ // Changes activation to the specified Widget. The currently active Widget |
+ // is de-activated. |
+ void ActivateWidget(Widget* widget); |
+ void CreateTestWindow(const std::wstring& title, |
+ SkColor color, |
+ gfx::Rect initial_bounds, |
+ bool rotate); |
+ |
private: |
// Overridden from View: |
virtual void Layout() OVERRIDE; |
@@ -40,11 +45,6 @@ |
virtual void WindowClosing() OVERRIDE; |
virtual View* GetContentsView() OVERRIDE; |
- void CreateTestWindow(const std::wstring& title, |
- SkColor color, |
- gfx::Rect initial_bounds, |
- bool rotate); |
- |
NativeWidgetViews* active_widget_; |
DISALLOW_COPY_AND_ASSIGN(DesktopWindow); |