projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 7.36.149.0
[platform/framework/web/crosswalk.git]
/
src
/
chrome
/
browser
/
ui
/
cocoa
/
apps
/
native_app_window_cocoa.h
diff --git
a/src/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h
b/src/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h
index
94eb252
..
716c573
100644
(file)
--- a/
src/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h
+++ b/
src/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h
@@
-8,7
+8,6
@@
#import <Cocoa/Cocoa.h>
#include <vector>
#import <Cocoa/Cocoa.h>
#include <vector>
-#include "apps/app_window.h"
#include "apps/size_constraints.h"
#include "apps/ui/native_app_window.h"
#include "base/mac/scoped_nsobject.h"
#include "apps/size_constraints.h"
#include "apps/ui/native_app_window.h"
#include "base/mac/scoped_nsobject.h"
@@
-18,6
+17,10
@@
#include "extensions/common/draggable_region.h"
#include "ui/gfx/rect.h"
#include "extensions/common/draggable_region.h"
#include "ui/gfx/rect.h"
+namespace apps {
+class AppWindow;
+}
+
class ExtensionKeybindingRegistryCocoa;
class NativeAppWindowCocoa;
@class ShellNSWindow;
class ExtensionKeybindingRegistryCocoa;
class NativeAppWindowCocoa;
@class ShellNSWindow;
@@
-123,7
+126,8
@@
class NativeAppWindowCocoa : public apps::NativeAppWindow,
const content::NativeWebKeyboardEvent& event) OVERRIDE;
virtual bool IsFrameless() const OVERRIDE;
virtual bool HasFrameColor() const OVERRIDE;
const content::NativeWebKeyboardEvent& event) OVERRIDE;
virtual bool IsFrameless() const OVERRIDE;
virtual bool HasFrameColor() const OVERRIDE;
- virtual SkColor FrameColor() const OVERRIDE;
+ virtual SkColor ActiveFrameColor() const OVERRIDE;
+ virtual SkColor InactiveFrameColor() const OVERRIDE;
virtual gfx::Insets GetFrameInsets() const OVERRIDE;
// These are used to simulate Mac-style hide/show. Since windows can be hidden
virtual gfx::Insets GetFrameInsets() const OVERRIDE;
// These are used to simulate Mac-style hide/show. Since windows can be hidden
@@
-155,13
+159,7
@@
class NativeAppWindowCocoa : public apps::NativeAppWindow,
virtual ~NativeAppWindowCocoa();
ShellNSWindow* window() const;
virtual ~NativeAppWindowCocoa();
ShellNSWindow* window() const;
-
- content::WebContents* web_contents() const {
- return app_window_->web_contents();
- }
- const extensions::Extension* extension() const {
- return app_window_->extension();
- }
+ content::WebContents* WebContents() const;
// Returns the WindowStyleMask based on the type of window frame.
// Specifically, this includes NSResizableWindowMask if the window is
// Returns the WindowStyleMask based on the type of window frame.
// Specifically, this includes NSResizableWindowMask if the window is