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

Side by Side Diff: chrome/browser/ui/extensions/shell_window.h

Issue 11359194: Revert 167255 - ui: Remove gfx::Size::ClampToNonNegative, prevent negative sizes always. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month 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 (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_EXTENSIONS_SHELL_WINDOW_H_ 5 #ifndef CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_
6 #define CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_ 6 #define CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "chrome/browser/extensions/extension_function_dispatcher.h" 9 #include "chrome/browser/extensions/extension_function_dispatcher.h"
10 #include "chrome/browser/extensions/extension_keybinding_registry.h" 10 #include "chrome/browser/extensions/extension_keybinding_registry.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 enum Frame { 48 enum Frame {
49 FRAME_CHROME, // Chrome-style window frame. 49 FRAME_CHROME, // Chrome-style window frame.
50 FRAME_NONE, // Frameless window. 50 FRAME_NONE, // Frameless window.
51 }; 51 };
52 52
53 CreateParams(); 53 CreateParams();
54 ~CreateParams(); 54 ~CreateParams();
55 55
56 Frame frame; 56 Frame frame;
57 // Specify the initial bounds of the window. INT_MIN designates 57 // Specify the initial bounds of the window. INT_MIN designates
58 // 'unspecified' for the position components, and 0 for the size components. 58 // 'unspecified' for any coordinate, and should be replaced with a default
59 // When unspecified, they should be replaced with a default value. 59 // value.
60 gfx::Rect bounds; 60 gfx::Rect bounds;
61 // Specify if bounds should be restored from a previous time. 61 // Specify if bounds should be restored from a previous time.
62 bool restore_position; 62 bool restore_position;
63 bool restore_size; 63 bool restore_size;
64 64
65 gfx::Size minimum_size; 65 gfx::Size minimum_size;
66 gfx::Size maximum_size; 66 gfx::Size maximum_size;
67 67
68 std::string window_key; 68 std::string window_key;
69 69
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 213
214 // Used for loading app_icon_. 214 // Used for loading app_icon_.
215 scoped_ptr<ImageLoadingTracker> app_icon_loader_; 215 scoped_ptr<ImageLoadingTracker> app_icon_loader_;
216 216
217 scoped_ptr<NativeShellWindow> native_window_; 217 scoped_ptr<NativeShellWindow> native_window_;
218 218
219 DISALLOW_COPY_AND_ASSIGN(ShellWindow); 219 DISALLOW_COPY_AND_ASSIGN(ShellWindow);
220 }; 220 };
221 221
222 #endif // CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_ 222 #endif // CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/app_window/app_window_api.cc ('k') | chrome/browser/ui/extensions/shell_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698