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

Side by Side Diff: chrome/browser/ui/cocoa/extensions/shell_window_cocoa.h

Issue 11028125: Remove legacy draggable region code and refactor to share common draggable region code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Created 8 years, 2 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/extensions/shell_window_cocoa.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_COCOA_EXTENSIONS_SHELL_WINDOW_COCOA_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_EXTENSIONS_SHELL_WINDOW_COCOA_H_
6 #define CHROME_BROWSER_UI_COCOA_EXTENSIONS_SHELL_WINDOW_COCOA_H_ 6 #define CHROME_BROWSER_UI_COCOA_EXTENSIONS_SHELL_WINDOW_COCOA_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 SkRegion* draggable_region() const { return draggable_region_.get(); } 96 SkRegion* draggable_region() const { return draggable_region_.get(); }
97 97
98 protected: 98 protected:
99 // NativeShellWindow implementation. 99 // NativeShellWindow implementation.
100 virtual void SetFullscreen(bool fullscreen) OVERRIDE; 100 virtual void SetFullscreen(bool fullscreen) OVERRIDE;
101 virtual bool IsFullscreenOrPending() const OVERRIDE; 101 virtual bool IsFullscreenOrPending() const OVERRIDE;
102 virtual void UpdateWindowIcon() OVERRIDE; 102 virtual void UpdateWindowIcon() OVERRIDE;
103 virtual void UpdateWindowTitle() OVERRIDE; 103 virtual void UpdateWindowTitle() OVERRIDE;
104 virtual void UpdateDraggableRegions( 104 virtual void UpdateDraggableRegions(
105 const std::vector<extensions::DraggableRegion>& regions) OVERRIDE; 105 const std::vector<extensions::DraggableRegion>& regions) OVERRIDE;
106 virtual void UpdateLegacyDraggableRegions(
107 const std::vector<extensions::DraggableRegion>& regions) OVERRIDE;
108 virtual void HandleKeyboardEvent( 106 virtual void HandleKeyboardEvent(
109 const content::NativeWebKeyboardEvent& event) OVERRIDE; 107 const content::NativeWebKeyboardEvent& event) OVERRIDE;
110 108
111 private: 109 private:
112 virtual ~ShellWindowCocoa(); 110 virtual ~ShellWindowCocoa();
113 111
114 ShellNSWindow* window() const; 112 ShellNSWindow* window() const;
115 113
116 content::WebContents* web_contents() const { 114 content::WebContents* web_contents() const {
117 return shell_window_->web_contents(); 115 return shell_window_->web_contents();
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 NSPoint last_mouse_location_; 154 NSPoint last_mouse_location_;
157 155
158 // The Extension Command Registry used to determine which keyboard events to 156 // The Extension Command Registry used to determine which keyboard events to
159 // handle. 157 // handle.
160 scoped_ptr<ExtensionKeybindingRegistryCocoa> extension_keybinding_registry_; 158 scoped_ptr<ExtensionKeybindingRegistryCocoa> extension_keybinding_registry_;
161 159
162 DISALLOW_COPY_AND_ASSIGN(ShellWindowCocoa); 160 DISALLOW_COPY_AND_ASSIGN(ShellWindowCocoa);
163 }; 161 };
164 162
165 #endif // CHROME_BROWSER_UI_COCOA_EXTENSIONS_SHELL_WINDOW_COCOA_H_ 163 #endif // CHROME_BROWSER_UI_COCOA_EXTENSIONS_SHELL_WINDOW_COCOA_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/extensions/shell_window_cocoa.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698