| OLD | NEW |
| 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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 // default size. | 59 // default size. |
| 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 |
| 70 // The process ID of the process that requested the create. |
| 71 int32 creator_process_id; |
| 69 }; | 72 }; |
| 70 | 73 |
| 71 static ShellWindow* Create(Profile* profile, | 74 static ShellWindow* Create(Profile* profile, |
| 72 const extensions::Extension* extension, | 75 const extensions::Extension* extension, |
| 73 const GURL& url, | 76 const GURL& url, |
| 74 const CreateParams& params); | 77 const CreateParams& params); |
| 75 | 78 |
| 76 const std::string& window_key() const { return window_key_; } | 79 const std::string& window_key() const { return window_key_; } |
| 77 const SessionID& session_id() const { return session_id_; } | 80 const SessionID& session_id() const { return session_id_; } |
| 78 const extensions::Extension* extension() const { return extension_; } | 81 const extensions::Extension* extension() const { return extension_; } |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 200 | 203 |
| 201 // Used for loading app_icon_. | 204 // Used for loading app_icon_. |
| 202 scoped_ptr<ImageLoadingTracker> app_icon_loader_; | 205 scoped_ptr<ImageLoadingTracker> app_icon_loader_; |
| 203 | 206 |
| 204 scoped_ptr<NativeShellWindow> native_window_; | 207 scoped_ptr<NativeShellWindow> native_window_; |
| 205 | 208 |
| 206 DISALLOW_COPY_AND_ASSIGN(ShellWindow); | 209 DISALLOW_COPY_AND_ASSIGN(ShellWindow); |
| 207 }; | 210 }; |
| 208 | 211 |
| 209 #endif // CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_ | 212 #endif // CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_ |
| OLD | NEW |