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

Unified Diff: chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.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/cocoa/extensions/native_app_window_cocoa.h
diff --git a/chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.h b/chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.h
deleted file mode 100644
index 1eefbfbd5929c4be145b26c2741fdc791eec006b..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.h
+++ /dev/null
@@ -1,194 +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_COCOA_EXTENSIONS_NATIVE_APP_WINDOW_COCOA_H_
-#define CHROME_BROWSER_UI_COCOA_EXTENSIONS_NATIVE_APP_WINDOW_COCOA_H_
-
-#import <Cocoa/Cocoa.h>
-#include <vector>
-
-#include "apps/shell_window.h"
-#include "base/mac/scoped_nsobject.h"
-#include "base/memory/scoped_ptr.h"
-#import "chrome/browser/ui/cocoa/browser_command_executor.h"
-#include "chrome/browser/ui/extensions/native_app_window.h"
-#include "content/public/browser/notification_registrar.h"
-#include "extensions/common/draggable_region.h"
-#include "ui/gfx/rect.h"
-
-class ExtensionKeybindingRegistryCocoa;
-class Profile;
-class NativeAppWindowCocoa;
-@class ShellNSWindow;
-class SkRegion;
-
-// A window controller for a minimal window to host a web app view. Passes
-// Objective-C notifications to the C++ bridge.
-@interface NativeAppWindowController : NSWindowController
- <NSWindowDelegate,
- BrowserCommandExecutor> {
- @private
- NativeAppWindowCocoa* appWindow_; // Weak; owns self.
-}
-
-@property(assign, nonatomic) NativeAppWindowCocoa* appWindow;
-
-// Consults the Command Registry to see if this |event| needs to be handled as
-// an extension command and returns YES if so (NO otherwise).
-- (BOOL)handledByExtensionCommand:(NSEvent*)event;
-
-@end
-
-// Cocoa bridge to AppWindow.
-class NativeAppWindowCocoa : public NativeAppWindow {
- public:
- NativeAppWindowCocoa(apps::ShellWindow* shell_window,
- const apps::ShellWindow::CreateParams& params);
-
- // 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;
-
- // Called when the window is about to be closed.
- void WindowWillClose();
-
- // Called when the window is focused.
- void WindowDidBecomeKey();
-
- // Called when the window is defocused.
- void WindowDidResignKey();
-
- // Called when the window is resized.
- void WindowDidResize();
-
- // Called when the window is moved.
- void WindowDidMove();
-
- // Called when the window is minimized.
- void WindowDidMiniaturize();
-
- // Called when the window is un-minimized.
- void WindowDidDeminiaturize();
-
- // Called when the window is zoomed (maximized or de-maximized).
- void WindowWillZoom();
-
- // Called to handle a key event.
- bool HandledByExtensionCommand(NSEvent* event);
-
- // Called to handle a mouse event.
- void HandleMouseEvent(NSEvent* event);
-
- // Returns true if |point| in local Cocoa coordinate system falls within
- // the draggable region.
- bool IsWithinDraggableRegion(NSPoint point) const;
-
- bool use_system_drag() const { return use_system_drag_; }
-
- protected:
- // 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;
-
- // 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;
-
- private:
- virtual ~NativeAppWindowCocoa();
-
- ShellNSWindow* window() const;
-
- content::WebContents* web_contents() const {
- return shell_window_->web_contents();
- }
- const extensions::Extension* extension() const {
- return shell_window_->extension();
- }
-
- // Returns the WindowStyleMask based on the type of window frame.
- // Specifically, this includes NSResizableWindowMask if the window is
- // resizable, and does not include NSTexturedBackgroundWindowMask when a
- // native frame is used.
- NSUInteger GetWindowStyleMask() const;
-
- void InstallView();
- void UninstallView();
- void InstallDraggableRegionViews();
- void UpdateDraggableRegionsForSystemDrag(
- const std::vector<extensions::DraggableRegion>& regions,
- const extensions::DraggableRegion* draggable_area);
- void UpdateDraggableRegionsForCustomDrag(
- const std::vector<extensions::DraggableRegion>& regions);
-
- apps::ShellWindow* shell_window_; // weak - ShellWindow owns NativeAppWindow.
-
- bool has_frame_;
-
- bool is_maximized_;
- bool is_fullscreen_;
- NSRect restored_bounds_;
-
- gfx::Size min_size_;
- gfx::Size max_size_;
- bool resizable_;
-
- base::scoped_nsobject<NativeAppWindowController> window_controller_;
- NSInteger attention_request_id_; // identifier from requestUserAttention
-
- // Indicates whether system drag or custom drag should be used, depending on
- // the complexity of draggable regions.
- bool use_system_drag_;
-
- // For system drag, the whole window is draggable and the non-draggable areas
- // have to been explicitly excluded.
- std::vector<gfx::Rect> system_drag_exclude_areas_;
-
- // For custom drag, the whole window is non-draggable and the draggable region
- // has to been explicitly provided.
- scoped_ptr<SkRegion> draggable_region_; // used in custom drag.
-
- // Mouse location since the last mouse event, in screen coordinates. This is
- // used in custom drag to compute the window movement.
- NSPoint last_mouse_location_;
-
- // The Extension Command Registry used to determine which keyboard events to
- // handle.
- scoped_ptr<ExtensionKeybindingRegistryCocoa> extension_keybinding_registry_;
-
- DISALLOW_COPY_AND_ASSIGN(NativeAppWindowCocoa);
-};
-
-#endif // CHROME_BROWSER_UI_COCOA_EXTENSIONS_NATIVE_APP_WINDOW_COCOA_H_
« no previous file with comments | « chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm ('k') | chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698