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

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

Issue 265843005: Revert 267559 "[Mac] Implement frame.[color|inactiveColor]." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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
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 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 bool is_maximized_; 194 bool is_maximized_;
195 bool is_fullscreen_; 195 bool is_fullscreen_;
196 NSRect restored_bounds_; 196 NSRect restored_bounds_;
197 197
198 bool is_resizable_; 198 bool is_resizable_;
199 bool shows_resize_controls_; 199 bool shows_resize_controls_;
200 bool shows_fullscreen_controls_; 200 bool shows_fullscreen_controls_;
201 201
202 apps::SizeConstraints size_constraints_; 202 apps::SizeConstraints size_constraints_;
203 203
204 bool has_frame_color_;
205 SkColor active_frame_color_;
206 SkColor inactive_frame_color_;
207
208 base::scoped_nsobject<NativeAppWindowController> window_controller_; 204 base::scoped_nsobject<NativeAppWindowController> window_controller_;
209 NSInteger attention_request_id_; // identifier from requestUserAttention 205 NSInteger attention_request_id_; // identifier from requestUserAttention
210 206
211 // For system drag, the whole window is draggable and the non-draggable areas 207 // For system drag, the whole window is draggable and the non-draggable areas
212 // have to been explicitly excluded. 208 // have to been explicitly excluded.
213 std::vector<extensions::DraggableRegion> draggable_regions_; 209 std::vector<extensions::DraggableRegion> draggable_regions_;
214 210
215 // The Extension Command Registry used to determine which keyboard events to 211 // The Extension Command Registry used to determine which keyboard events to
216 // handle. 212 // handle.
217 scoped_ptr<ExtensionKeybindingRegistryCocoa> extension_keybinding_registry_; 213 scoped_ptr<ExtensionKeybindingRegistryCocoa> extension_keybinding_registry_;
218 214
219 DISALLOW_COPY_AND_ASSIGN(NativeAppWindowCocoa); 215 DISALLOW_COPY_AND_ASSIGN(NativeAppWindowCocoa);
220 }; 216 };
221 217
222 #endif // CHROME_BROWSER_UI_COCOA_APPS_NATIVE_APP_WINDOW_COCOA_H_ 218 #endif // CHROME_BROWSER_UI_COCOA_APPS_NATIVE_APP_WINDOW_COCOA_H_
OLDNEW
« no previous file with comments | « trunk/src/chrome/browser/about_flags.cc ('k') | trunk/src/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