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

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

Issue 13139004: Deprecate Browser::TYPE_PANEL (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 8 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 (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 "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "chrome/browser/extensions/extension_keybinding_registry.h" 10 #include "chrome/browser/extensions/extension_keybinding_registry.h"
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 void SetAppIconUrl(const GURL& icon_url); 171 void SetAppIconUrl(const GURL& icon_url);
172 172
173 // Called from the render interface to modify the draggable regions. 173 // Called from the render interface to modify the draggable regions.
174 void UpdateDraggableRegions( 174 void UpdateDraggableRegions(
175 const std::vector<extensions::DraggableRegion>& regions); 175 const std::vector<extensions::DraggableRegion>& regions);
176 176
177 // Updates the app image to |image|. Called internally from the image loader 177 // Updates the app image to |image|. Called internally from the image loader
178 // callback. Also called externally for v1 apps using Ash Panels. 178 // callback. Also called externally for v1 apps using Ash Panels.
179 void UpdateAppIcon(const gfx::Image& image); 179 void UpdateAppIcon(const gfx::Image& image);
180 180
181 ShellWindowContents* shell_window_contents_for_test() {
182 return shell_window_contents_.get();
183 }
184
181 protected: 185 protected:
182 virtual ~ShellWindow(); 186 virtual ~ShellWindow();
183 187
184 private: 188 private:
185 // PlatformAppBrowserTest needs access to web_contents() 189 // PlatformAppBrowserTest needs access to web_contents()
186 friend class extensions::PlatformAppBrowserTest; 190 friend class extensions::PlatformAppBrowserTest;
187 191
188 // content::WebContentsDelegate implementation. 192 // content::WebContentsDelegate implementation.
189 virtual void CloseContents(content::WebContents* contents) OVERRIDE; 193 virtual void CloseContents(content::WebContents* contents) OVERRIDE;
190 virtual bool ShouldSuppressDialogs() OVERRIDE; 194 virtual bool ShouldSuppressDialogs() OVERRIDE;
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 273
270 scoped_ptr<NativeAppWindow> native_app_window_; 274 scoped_ptr<NativeAppWindow> native_app_window_;
271 scoped_ptr<ShellWindowContents> shell_window_contents_; 275 scoped_ptr<ShellWindowContents> shell_window_contents_;
272 276
273 base::WeakPtrFactory<ShellWindow> image_loader_ptr_factory_; 277 base::WeakPtrFactory<ShellWindow> image_loader_ptr_factory_;
274 278
275 DISALLOW_COPY_AND_ASSIGN(ShellWindow); 279 DISALLOW_COPY_AND_ASSIGN(ShellWindow);
276 }; 280 };
277 281
278 #endif // CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_ 282 #endif // CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_controller.mm ('k') | chrome/browser/ui/gtk/browser_titlebar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698