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

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

Issue 10584026: Allow ChromeOS file selection dialog to be shown from shell windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Another rebase Created 8 years, 5 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 #pragma once 7 #pragma once
8 8
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "chrome/browser/extensions/extension_function_dispatcher.h" 10 #include "chrome/browser/extensions/extension_function_dispatcher.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 gfx::Size maximum_size; 54 gfx::Size maximum_size;
55 }; 55 };
56 56
57 static ShellWindow* Create(Profile* profile, 57 static ShellWindow* Create(Profile* profile,
58 const extensions::Extension* extension, 58 const extensions::Extension* extension,
59 const GURL& url, 59 const GURL& url,
60 const CreateParams& params); 60 const CreateParams& params);
61 61
62 const SessionID& session_id() const { return session_id_; } 62 const SessionID& session_id() const { return session_id_; }
63 const extensions::Extension* extension() const { return extension_; } 63 const extensions::Extension* extension() const { return extension_; }
64 const TabContents* tab_contents() const { return contents_.get(); }
64 content::WebContents* web_contents() const { return web_contents_; } 65 content::WebContents* web_contents() const { return web_contents_; }
65 66
66 protected: 67 protected:
67 ShellWindow(Profile* profile, 68 ShellWindow(Profile* profile,
68 const extensions::Extension* extension, 69 const extensions::Extension* extension,
69 const GURL& url); 70 const GURL& url);
70 virtual ~ShellWindow(); 71 virtual ~ShellWindow();
71 72
72 // Called when the title of the window changes. 73 // Called when the title of the window changes.
73 virtual void UpdateWindowTitle() {} 74 virtual void UpdateWindowTitle() {}
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 scoped_ptr<TabContents> contents_; 153 scoped_ptr<TabContents> contents_;
153 // web_contents_ is owned by contents_. 154 // web_contents_ is owned by contents_.
154 content::WebContents* web_contents_; 155 content::WebContents* web_contents_;
155 content::NotificationRegistrar registrar_; 156 content::NotificationRegistrar registrar_;
156 ExtensionFunctionDispatcher extension_function_dispatcher_; 157 ExtensionFunctionDispatcher extension_function_dispatcher_;
157 158
158 DISALLOW_COPY_AND_ASSIGN(ShellWindow); 159 DISALLOW_COPY_AND_ASSIGN(ShellWindow);
159 }; 160 };
160 161
161 #endif // CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_ 162 #endif // CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_
OLDNEW
« no previous file with comments | « chrome/browser/extensions/shell_window_registry.cc ('k') | chrome/browser/ui/views/extensions/extension_dialog.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698