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

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

Issue 11028125: Remove legacy draggable region code and refactor to share common draggable region code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix 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 | 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 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 // Convert draggable regions in raw format to SkRegion format. Caller is
77 // responsible for deleting the returned SkRegion instance.
78 static SkRegion* RawDraggableRegionsToSkRegion(
79 const std::vector<extensions::DraggableRegion>& regions);
80
76 const std::string& window_key() const { return window_key_; } 81 const std::string& window_key() const { return window_key_; }
77 const SessionID& session_id() const { return session_id_; } 82 const SessionID& session_id() const { return session_id_; }
78 const extensions::Extension* extension() const { return extension_; } 83 const extensions::Extension* extension() const { return extension_; }
79 TabContents* tab_contents() const { return contents_.get(); } 84 TabContents* tab_contents() const { return contents_.get(); }
80 content::WebContents* web_contents() const { return web_contents_; } 85 content::WebContents* web_contents() const { return web_contents_; }
81 Profile* profile() const { return profile_; } 86 Profile* profile() const { return profile_; }
82 const gfx::Image& app_icon() const { return app_icon_; } 87 const gfx::Image& app_icon() const { return app_icon_; }
83 88
84 BaseWindow* GetBaseWindow(); 89 BaseWindow* GetBaseWindow();
85 gfx::NativeWindow GetNativeWindow() { 90 gfx::NativeWindow GetNativeWindow() {
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 205
201 // Used for loading app_icon_. 206 // Used for loading app_icon_.
202 scoped_ptr<ImageLoadingTracker> app_icon_loader_; 207 scoped_ptr<ImageLoadingTracker> app_icon_loader_;
203 208
204 scoped_ptr<NativeShellWindow> native_window_; 209 scoped_ptr<NativeShellWindow> native_window_;
205 210
206 DISALLOW_COPY_AND_ASSIGN(ShellWindow); 211 DISALLOW_COPY_AND_ASSIGN(ShellWindow);
207 }; 212 };
208 213
209 #endif // CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_ 214 #endif // CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/extensions/native_shell_window.h ('k') | chrome/browser/ui/extensions/shell_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698