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

Unified Diff: chrome/browser/ui/views/extensions/native_app_window_views.h

Issue 21344002: Move native_app_window code to apps areas (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to after mac app shim fix Created 7 years, 4 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/extensions/native_app_window_views.h
diff --git a/chrome/browser/ui/views/extensions/native_app_window_views.h b/chrome/browser/ui/views/extensions/native_app_window_views.h
deleted file mode 100644
index 138a9e0fa91d3f35d96fbbd70c22fba524e7c271..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/views/extensions/native_app_window_views.h
+++ /dev/null
@@ -1,185 +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 CHROME_BROWSER_UI_VIEWS_EXTENSIONS_NATIVE_APP_WINDOW_VIEWS_H_
-#define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_NATIVE_APP_WINDOW_VIEWS_H_
-
-#include "apps/shell_window.h"
-#include "base/observer_list.h"
-#include "chrome/browser/ui/extensions/native_app_window.h"
-#include "content/public/browser/web_contents_observer.h"
-#include "third_party/skia/include/core/SkRegion.h"
-#include "ui/gfx/image/image_skia.h"
-#include "ui/gfx/rect.h"
-#include "ui/views/controls/webview/unhandled_keyboard_event_handler.h"
-#include "ui/views/widget/widget_delegate.h"
-#include "ui/views/widget/widget_observer.h"
-
-#if defined(OS_WIN)
-#include "chrome/browser/shell_integration.h"
-#endif
-
-class ExtensionKeybindingRegistryViews;
-class Profile;
-
-namespace content {
-class RenderViewHost;
-class WebContents;
-}
-
-namespace extensions {
-class Extension;
-}
-
-namespace views {
-class WebView;
-}
-
-class NativeAppWindowViews : public NativeAppWindow,
- public views::WidgetDelegateView,
- public views::WidgetObserver,
- public content::WebContentsObserver {
- public:
- NativeAppWindowViews(apps::ShellWindow* shell_window,
- const apps::ShellWindow::CreateParams& params);
- virtual ~NativeAppWindowViews();
-
- bool frameless() const { return frameless_; }
- SkRegion* draggable_region() { return draggable_region_.get(); }
-
- private:
- void InitializeDefaultWindow(
- const apps::ShellWindow::CreateParams& create_params);
- void InitializePanelWindow(
- const apps::ShellWindow::CreateParams& create_params);
- void OnViewWasResized();
-
- bool ShouldUseChromeStyleFrame() const;
-
-#if defined(OS_WIN)
- void OnShortcutInfoLoaded(
- const ShellIntegration::ShortcutInfo& shortcut_info);
- HWND GetNativeAppWindowHWND() const;
-#endif
-
- // ui::BaseWindow implementation.
- virtual bool IsActive() const OVERRIDE;
- virtual bool IsMaximized() const OVERRIDE;
- virtual bool IsMinimized() const OVERRIDE;
- virtual bool IsFullscreen() const OVERRIDE;
- virtual gfx::NativeWindow GetNativeWindow() OVERRIDE;
- virtual gfx::Rect GetRestoredBounds() const OVERRIDE;
- virtual ui::WindowShowState GetRestoredState() const OVERRIDE;
- virtual gfx::Rect GetBounds() const OVERRIDE;
- virtual void Show() OVERRIDE;
- virtual void ShowInactive() OVERRIDE;
- virtual void Hide() OVERRIDE;
- virtual void Close() OVERRIDE;
- virtual void Activate() OVERRIDE;
- virtual void Deactivate() OVERRIDE;
- virtual void Maximize() OVERRIDE;
- virtual void Minimize() OVERRIDE;
- virtual void Restore() OVERRIDE;
- virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE;
- virtual void FlashFrame(bool flash) OVERRIDE;
- virtual bool IsAlwaysOnTop() const OVERRIDE;
-
- // WidgetDelegate implementation.
- virtual void OnWidgetMove() OVERRIDE;
- virtual views::View* GetInitiallyFocusedView() OVERRIDE;
- virtual bool CanResize() const OVERRIDE;
- virtual bool CanMaximize() const OVERRIDE;
- virtual string16 GetWindowTitle() const OVERRIDE;
- virtual bool ShouldShowWindowTitle() const OVERRIDE;
- virtual gfx::ImageSkia GetWindowAppIcon() OVERRIDE;
- virtual gfx::ImageSkia GetWindowIcon() OVERRIDE;
- virtual bool ShouldShowWindowIcon() const OVERRIDE;
- virtual void SaveWindowPlacement(const gfx::Rect& bounds,
- ui::WindowShowState show_state) OVERRIDE;
- virtual void DeleteDelegate() OVERRIDE;
- virtual views::Widget* GetWidget() OVERRIDE;
- virtual const views::Widget* GetWidget() const OVERRIDE;
- virtual views::View* GetContentsView() OVERRIDE;
- virtual views::NonClientFrameView* CreateNonClientFrameView(
- views::Widget* widget) OVERRIDE;
- virtual bool ShouldDescendIntoChildForEventHandling(
- gfx::NativeView child,
- const gfx::Point& location) OVERRIDE;
-
- // WidgetObserver implementation.
- virtual void OnWidgetVisibilityChanged(views::Widget* widget,
- bool visible) OVERRIDE;
- virtual void OnWidgetActivationChanged(views::Widget* widget,
- bool active) OVERRIDE;
-
- // WebContentsObserver implementation.
- virtual void RenderViewCreated(
- content::RenderViewHost* render_view_host) OVERRIDE;
-
- // views::View implementation.
- virtual void Layout() OVERRIDE;
- virtual void ViewHierarchyChanged(
- const ViewHierarchyChangedDetails& details) OVERRIDE;
- virtual gfx::Size GetPreferredSize() OVERRIDE;
- virtual gfx::Size GetMinimumSize() OVERRIDE;
- virtual gfx::Size GetMaximumSize() OVERRIDE;
- virtual void OnFocus() OVERRIDE;
- virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
-
- // NativeAppWindow implementation.
- virtual void SetFullscreen(bool fullscreen) OVERRIDE;
- virtual bool IsFullscreenOrPending() const OVERRIDE;
- virtual bool IsDetached() const OVERRIDE;
- virtual void UpdateWindowIcon() OVERRIDE;
- virtual void UpdateWindowTitle() OVERRIDE;
- virtual void UpdateDraggableRegions(
- const std::vector<extensions::DraggableRegion>& regions) OVERRIDE;
- virtual void HandleKeyboardEvent(
- const content::NativeWebKeyboardEvent& event) OVERRIDE;
- virtual void RenderViewHostChanged() OVERRIDE;
- virtual gfx::Insets GetFrameInsets() const OVERRIDE;
-
- // web_modal::WebContentsModalDialogHost implementation.
- virtual gfx::NativeView GetHostView() const OVERRIDE;
- virtual gfx::Point GetDialogPosition(const gfx::Size& size) OVERRIDE;
- virtual void AddObserver(
- web_modal::WebContentsModalDialogHostObserver* observer) OVERRIDE;
- virtual void RemoveObserver(
- web_modal::WebContentsModalDialogHostObserver* observer) OVERRIDE;
-
- Profile* profile() { return shell_window_->profile(); }
- content::WebContents* web_contents() {
- return shell_window_->web_contents();
- }
- const extensions::Extension* extension() {
- return shell_window_->extension();
- }
-
- apps::ShellWindow* shell_window_; // weak - ShellWindow owns NativeAppWindow.
- views::WebView* web_view_;
- views::Widget* window_;
- bool is_fullscreen_;
-
- scoped_ptr<SkRegion> draggable_region_;
-
- const bool frameless_;
- const bool transparent_background_;
- gfx::Size minimum_size_;
- gfx::Size maximum_size_;
- gfx::Size preferred_size_;
- bool resizable_;
-
- // The class that registers for keyboard shortcuts for extension commands.
- scoped_ptr<ExtensionKeybindingRegistryViews> extension_keybinding_registry_;
-
- views::UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_;
-
- base::WeakPtrFactory<NativeAppWindowViews> weak_ptr_factory_;
-
- ObserverList<web_modal::WebContentsModalDialogHostObserver> observer_list_;
-
- DISALLOW_COPY_AND_ASSIGN(NativeAppWindowViews);
-};
-
-#endif // CHROME_BROWSER_UI_VIEWS_EXTENSIONS_NATIVE_APP_WINDOW_VIEWS_H_
« no previous file with comments | « chrome/browser/ui/views/apps/native_app_window_views.cc ('k') | chrome/browser/ui/views/extensions/native_app_window_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698