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

Unified Diff: chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.h

Issue 947343003: Split out Ash/Aura parts of ChromeNativeAppWindowViews. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments, retain UpdateShape behavior. Created 5 years, 10 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: chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.h
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.h b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.h
new file mode 100644
index 0000000000000000000000000000000000000000..a8ad016205ecd8c440c796547c50696f2d38deef
--- /dev/null
+++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.h
@@ -0,0 +1,79 @@
+// Copyright 2015 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 CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_AURA_H_
+#define CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_AURA_H_
+
+#include "base/memory/scoped_ptr.h"
+#include "chrome/browser/ui/views/apps/chrome_native_app_window_views.h"
+#include "ui/views/context_menu_controller.h"
+
+namespace apps {
+class AppWindowFrameView;
+}
+
+namespace ash {
+class ImmersiveFullscreenController;
+}
+
+namespace views {
+class MenuRunner;
+}
+
+// Aura-specific parts of ChromeNativeAppWindowViews. This is used on Linux,
+// CrOS, and Windows and implies USE_ASH.
+class ChromeNativeAppWindowViewsAura : public ChromeNativeAppWindowViews,
+ public views::ContextMenuController {
+ public:
+ ChromeNativeAppWindowViewsAura();
+ ~ChromeNativeAppWindowViewsAura() override;
+
+ protected:
+ // ChromeNativeAppWindowViews implementation.
+ void OnBeforeWidgetInit(
+ const extensions::AppWindow::CreateParams& create_params,
+ views::Widget::InitParams* init_params,
+ views::Widget* widget) override;
+ void OnBeforePanelWidgetInit(views::Widget::InitParams* init_params,
+ views::Widget* widget) override;
+ apps::AppWindowFrameView* CreateNonStandardAppFrame() override;
+
+ // ui::BaseWindow implementation.
+ gfx::Rect GetRestoredBounds() const override;
+ ui::WindowShowState GetRestoredState() const override;
+ bool IsAlwaysOnTop() const override;
+
+ // views::ContextMenuController implementation.
+ void ShowContextMenuForView(views::View* source,
+ const gfx::Point& p,
+ ui::MenuSourceType source_type) override;
+
+ // WidgetDelegate implementation.
+ views::NonClientFrameView* CreateNonClientFrameView(
+ views::Widget* widget) override;
+
+ // NativeAppWindow implementation.
+ void SetFullscreen(int fullscreen_types) override;
+ void UpdateShape(scoped_ptr<SkRegion> region) override;
+
+ private:
+ FRIEND_TEST_ALL_PREFIXES(ShapedAppWindowTargeterTest,
+ ResizeInsetsWithinBounds);
+
+ // Used to put non-frameless windows into immersive fullscreen on ChromeOS. In
+ // immersive fullscreen, the window header (title bar and window controls)
+ // slides onscreen as an overlay when the mouse is hovered at the top of the
+ // screen.
+ scoped_ptr<ash::ImmersiveFullscreenController>
+ immersive_fullscreen_controller_;
+
+#if defined(OS_CHROMEOS)
+ // Used to show the system menu.
+ scoped_ptr<views::MenuRunner> menu_runner_;
+#endif
+
+ DISALLOW_COPY_AND_ASSIGN(ChromeNativeAppWindowViewsAura);
+};
+
+#endif // CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_AURA_H_

Powered by Google App Engine
This is Rietveld 408576698