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

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

Issue 10910304: Cache the object given to the chrome.app.window.create callback (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: rebase due to r158473 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
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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 gfx::Size maximum_size; 66 gfx::Size maximum_size;
67 67
68 std::string window_key; 68 std::string window_key;
69 }; 69 };
70 70
71 static ShellWindow* Create(Profile* profile, 71 static ShellWindow* Create(Profile* profile,
72 const extensions::Extension* extension, 72 const extensions::Extension* extension,
73 const GURL& url, 73 const GURL& url,
74 const CreateParams& params); 74 const CreateParams& params);
75 75
76 const std::string& window_key() const { return window_key_; }
76 const SessionID& session_id() const { return session_id_; } 77 const SessionID& session_id() const { return session_id_; }
77 const extensions::Extension* extension() const { return extension_; } 78 const extensions::Extension* extension() const { return extension_; }
78 TabContents* tab_contents() const { return contents_.get(); } 79 TabContents* tab_contents() const { return contents_.get(); }
79 content::WebContents* web_contents() const { return web_contents_; } 80 content::WebContents* web_contents() const { return web_contents_; }
80 Profile* profile() const { return profile_; } 81 Profile* profile() const { return profile_; }
81 const gfx::Image& app_icon() const { return app_icon_; } 82 const gfx::Image& app_icon() const { return app_icon_; }
82 83
83 BaseWindow* GetBaseWindow(); 84 BaseWindow* GetBaseWindow();
84 gfx::NativeWindow GetNativeWindow() { 85 gfx::NativeWindow GetNativeWindow() {
85 return GetBaseWindow()->GetNativeWindow(); 86 return GetBaseWindow()->GetNativeWindow();
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 200
200 // Used for loading app_icon_. 201 // Used for loading app_icon_.
201 scoped_ptr<ImageLoadingTracker> app_icon_loader_; 202 scoped_ptr<ImageLoadingTracker> app_icon_loader_;
202 203
203 scoped_ptr<NativeShellWindow> native_window_; 204 scoped_ptr<NativeShellWindow> native_window_;
204 205
205 DISALLOW_COPY_AND_ASSIGN(ShellWindow); 206 DISALLOW_COPY_AND_ASSIGN(ShellWindow);
206 }; 207 };
207 208
208 #endif // CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_ 209 #endif // CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698