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

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 to r157512 (conflicts) Created 8 years, 3 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/image_loading_tracker.h" 10 #include "chrome/browser/extensions/image_loading_tracker.h"
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 gfx::Size maximum_size; 64 gfx::Size maximum_size;
65 65
66 std::string window_key; 66 std::string window_key;
67 }; 67 };
68 68
69 static ShellWindow* Create(Profile* profile, 69 static ShellWindow* Create(Profile* profile,
70 const extensions::Extension* extension, 70 const extensions::Extension* extension,
71 const GURL& url, 71 const GURL& url,
72 const CreateParams& params); 72 const CreateParams& params);
73 73
74 const std::string& window_key() const { return window_key_; }
74 const SessionID& session_id() const { return session_id_; } 75 const SessionID& session_id() const { return session_id_; }
75 const extensions::Extension* extension() const { return extension_; } 76 const extensions::Extension* extension() const { return extension_; }
76 TabContents* tab_contents() const { return contents_.get(); } 77 TabContents* tab_contents() const { return contents_.get(); }
77 content::WebContents* web_contents() const { return web_contents_; } 78 content::WebContents* web_contents() const { return web_contents_; }
78 Profile* profile() const { return profile_; } 79 Profile* profile() const { return profile_; }
79 const gfx::Image& app_icon() const { return app_icon_; } 80 const gfx::Image& app_icon() const { return app_icon_; }
80 81
81 BaseWindow* GetBaseWindow(); 82 BaseWindow* GetBaseWindow();
82 gfx::NativeWindow GetNativeWindow() { 83 gfx::NativeWindow GetNativeWindow() {
83 return GetBaseWindow()->GetNativeWindow(); 84 return GetBaseWindow()->GetNativeWindow();
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 194
194 // Used for loading app_icon_. 195 // Used for loading app_icon_.
195 scoped_ptr<ImageLoadingTracker> app_icon_loader_; 196 scoped_ptr<ImageLoadingTracker> app_icon_loader_;
196 197
197 scoped_ptr<NativeShellWindow> native_window_; 198 scoped_ptr<NativeShellWindow> native_window_;
198 199
199 DISALLOW_COPY_AND_ASSIGN(ShellWindow); 200 DISALLOW_COPY_AND_ASSIGN(ShellWindow);
200 }; 201 };
201 202
202 #endif // CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_ 203 #endif // CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698