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

Unified Diff: ui/views/widget/desktop_native_widget_helper_aura.h

Issue 10083057: Revert 132856 - Aura/ash split: Remove hacks and get chrome linking 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
« no previous file with comments | « ui/views/views_delegate.h ('k') | ui/views/widget/desktop_native_widget_helper_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/desktop_native_widget_helper_aura.h
===================================================================
--- ui/views/widget/desktop_native_widget_helper_aura.h (revision 132862)
+++ ui/views/widget/desktop_native_widget_helper_aura.h (working copy)
@@ -1,54 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef UI_VIEWS_WIDGET_DESKTOP_NATIVE_WIDGET_HELPER_AURA_H_
-#define UI_VIEWS_WIDGET_DESKTOP_NATIVE_WIDGET_HELPER_AURA_H_
-#pragma once
-
-#include "ui/aura/root_window_observer.h"
-#include "ui/gfx/rect.h"
-#include "ui/views/views_export.h"
-#include "ui/views/widget/native_widget_helper_aura.h"
-#include "ui/views/widget/widget.h"
-
-namespace aura {
-class RootWindow;
-}
-
-namespace views {
-class NativeWidgetAura;
-
-// Implementation of non-Ash desktop integration code, allowing
-// NativeWidgetAuras to work in a traditional desktop environment.
-class VIEWS_EXPORT DesktopNativeWidgetHelperAura
- : public NativeWidgetHelperAura,
- public aura::RootWindowObserver {
- public:
- explicit DesktopNativeWidgetHelperAura(NativeWidgetAura* widget);
- virtual ~DesktopNativeWidgetHelperAura();
-
- // Overridden from aura::NativeWidgetHelperAura:
- virtual void PreInitialize(const Widget::InitParams& params) OVERRIDE;
- virtual void ShowRootWindow() OVERRIDE;
- virtual aura::RootWindow* GetRootWindow() OVERRIDE;
- virtual gfx::Rect ModifyAndSetBounds(gfx::Rect bounds) OVERRIDE;
-
- // Overridden from aura::RootWindowObserver:
- virtual void OnRootWindowResized(const aura::RootWindow* root,
- const gfx::Size& old_size) OVERRIDE;
- virtual void OnRootWindowHostClosed(const aura::RootWindow* root) OVERRIDE;
-
- private:
- // A weak pointer back to our owning widget.
- NativeWidgetAura* widget_;
-
- // Optionally, a RootWindow that we attach ourselves to.
- scoped_ptr<aura::RootWindow> root_window_;
-
- DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetHelperAura);
-};
-
-} // namespace views
-
-#endif // UI_VIEWS_WIDGET_DESKTOP_NATIVE_WIDGET_HELPER_AURA_H_
« no previous file with comments | « ui/views/views_delegate.h ('k') | ui/views/widget/desktop_native_widget_helper_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698