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

Side by Side Diff: chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h

Issue 928303003: [Mac] Use NSTitlebarAccessoryViewController to implement colored app window frames. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@nawc
Patch Set: 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_APPS_NATIVE_APP_WINDOW_COCOA_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_APPS_NATIVE_APP_WINDOW_COCOA_H_
6 #define CHROME_BROWSER_UI_COCOA_APPS_NATIVE_APP_WINDOW_COCOA_H_ 6 #define CHROME_BROWSER_UI_COCOA_APPS_NATIVE_APP_WINDOW_COCOA_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 // Called when the window is un-minimized. 108 // Called when the window is un-minimized.
109 void WindowDidDeminiaturize(); 109 void WindowDidDeminiaturize();
110 110
111 // Called when the window is zoomed (maximized or de-maximized). 111 // Called when the window is zoomed (maximized or de-maximized).
112 void WindowWillZoom(); 112 void WindowWillZoom();
113 113
114 // Called when the window enters fullscreen. 114 // Called when the window enters fullscreen.
115 void WindowDidEnterFullscreen(); 115 void WindowDidEnterFullscreen();
116 116
117 // Called when the window exits fullscreen. 117 // Called when the window exits fullscreen.
118 void WindowWillExitFullscreen();
118 void WindowDidExitFullscreen(); 119 void WindowDidExitFullscreen();
119 120
120 // Called to handle a key event. 121 // Called to handle a key event.
121 bool HandledByExtensionCommand( 122 bool HandledByExtensionCommand(
122 NSEvent* event, 123 NSEvent* event,
123 ui::AcceleratorManager::HandlerPriority priority); 124 ui::AcceleratorManager::HandlerPriority priority);
124 125
125 // Returns true if |point| in local Cocoa coordinate system falls within 126 // Returns true if |point| in local Cocoa coordinate system falls within
126 // the draggable region. 127 // the draggable region.
127 bool IsWithinDraggableRegion(NSPoint point) const; 128 bool IsWithinDraggableRegion(NSPoint point) const;
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 bool shows_fullscreen_controls_; 211 bool shows_fullscreen_controls_;
211 212
212 extensions::SizeConstraints size_constraints_; 213 extensions::SizeConstraints size_constraints_;
213 214
214 bool has_frame_color_; 215 bool has_frame_color_;
215 SkColor active_frame_color_; 216 SkColor active_frame_color_;
216 SkColor inactive_frame_color_; 217 SkColor inactive_frame_color_;
217 218
218 base::scoped_nsobject<NativeAppWindowController> window_controller_; 219 base::scoped_nsobject<NativeAppWindowController> window_controller_;
219 base::scoped_nsobject<TitlebarBackgroundView> titlebar_background_view_; 220 base::scoped_nsobject<TitlebarBackgroundView> titlebar_background_view_;
221 base::scoped_nsobject<id> titlebar_accessory_view_controller_;
220 222
221 // For system drag, the whole window is draggable and the non-draggable areas 223 // For system drag, the whole window is draggable and the non-draggable areas
222 // have to been explicitly excluded. 224 // have to been explicitly excluded.
223 std::vector<extensions::DraggableRegion> draggable_regions_; 225 std::vector<extensions::DraggableRegion> draggable_regions_;
224 226
225 // The Extension Command Registry used to determine which keyboard events to 227 // The Extension Command Registry used to determine which keyboard events to
226 // handle. 228 // handle.
227 scoped_ptr<ExtensionKeybindingRegistryCocoa> extension_keybinding_registry_; 229 scoped_ptr<ExtensionKeybindingRegistryCocoa> extension_keybinding_registry_;
228 230
229 DISALLOW_COPY_AND_ASSIGN(NativeAppWindowCocoa); 231 DISALLOW_COPY_AND_ASSIGN(NativeAppWindowCocoa);
230 }; 232 };
231 233
232 #endif // CHROME_BROWSER_UI_COCOA_APPS_NATIVE_APP_WINDOW_COCOA_H_ 234 #endif // CHROME_BROWSER_UI_COCOA_APPS_NATIVE_APP_WINDOW_COCOA_H_
OLDNEW
« no previous file with comments | « base/mac/sdk_forward_declarations.h ('k') | chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698