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

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

Issue 10411064: Move RunFileChooserHelper and EnumerateDirectoryHelper out of Browser. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "chrome/browser/ui/extensions/shell_window.h" 5 #include "chrome/browser/ui/extensions/shell_window.h"
6 6
7 #include "chrome/browser/extensions/extension_process_manager.h" 7 #include "chrome/browser/extensions/extension_process_manager.h"
8 #include "chrome/browser/extensions/extension_tabs_module_constants.h" 8 #include "chrome/browser/extensions/extension_tabs_module_constants.h"
9 #include "chrome/browser/extensions/extension_window_controller.h" 9 #include "chrome/browser/extensions/extension_window_controller.h"
10 #include "chrome/browser/extensions/shell_window_registry.h" 10 #include "chrome/browser/extensions/shell_window_registry.h"
11 #include "chrome/browser/file_select_helper.h"
11 #include "chrome/browser/intents/web_intents_util.h" 12 #include "chrome/browser/intents/web_intents_util.h"
12 #include "chrome/browser/lifetime/application_lifetime.h" 13 #include "chrome/browser/lifetime/application_lifetime.h"
13 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/browser/sessions/session_id.h" 15 #include "chrome/browser/sessions/session_id.h"
15 #include "chrome/browser/ui/browser.h" 16 #include "chrome/browser/ui/browser.h"
16 #include "chrome/browser/ui/intents/web_intent_picker_controller.h" 17 #include "chrome/browser/ui/intents/web_intent_picker_controller.h"
17 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" 18 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
18 #include "chrome/common/chrome_notification_types.h" 19 #include "chrome/common/chrome_notification_types.h"
19 #include "chrome/common/chrome_view_type.h" 20 #include "chrome/common/chrome_view_type.h"
20 #include "chrome/common/extensions/extension.h" 21 #include "chrome/common/extensions/extension.h"
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 166
166 contents_wrapper_->web_intent_picker_controller()->SetIntentsDispatcher( 167 contents_wrapper_->web_intent_picker_controller()->SetIntentsDispatcher(
167 intents_dispatcher); 168 intents_dispatcher);
168 contents_wrapper_->web_intent_picker_controller()->ShowDialog( 169 contents_wrapper_->web_intent_picker_controller()->ShowDialog(
169 intents_dispatcher->GetIntent().action, 170 intents_dispatcher->GetIntent().action,
170 intents_dispatcher->GetIntent().type); 171 intents_dispatcher->GetIntent().type);
171 } 172 }
172 173
173 void ShellWindow::RunFileChooser(WebContents* tab, 174 void ShellWindow::RunFileChooser(WebContents* tab,
174 const content::FileChooserParams& params) { 175 const content::FileChooserParams& params) {
175 Browser::RunFileChooserHelper(tab, params); 176 FileSelectHelper::RunFileChooser(tab, params);
176 } 177 }
177 178
178 void ShellWindow::Observe(int type, 179 void ShellWindow::Observe(int type,
179 const content::NotificationSource& source, 180 const content::NotificationSource& source,
180 const content::NotificationDetails& details) { 181 const content::NotificationDetails& details) {
181 switch (type) { 182 switch (type) {
182 case chrome::NOTIFICATION_EXTENSION_UNLOADED: { 183 case chrome::NOTIFICATION_EXTENSION_UNLOADED: {
183 const extensions::Extension* unloaded_extension = 184 const extensions::Extension* unloaded_extension =
184 content::Details<extensions::UnloadedExtensionInfo>( 185 content::Details<extensions::UnloadedExtensionInfo>(
185 details)->extension; 186 details)->extension;
(...skipping 10 matching lines...) Expand all
196 } 197 }
197 198
198 ExtensionWindowController* ShellWindow::GetExtensionWindowController() const { 199 ExtensionWindowController* ShellWindow::GetExtensionWindowController() const {
199 return extension_window_controller_.get(); 200 return extension_window_controller_.get();
200 } 201 }
201 202
202 void ShellWindow::OnRequest(const ExtensionHostMsg_Request_Params& params) { 203 void ShellWindow::OnRequest(const ExtensionHostMsg_Request_Params& params) {
203 extension_function_dispatcher_.Dispatch(params, 204 extension_function_dispatcher_.Dispatch(params,
204 web_contents_->GetRenderViewHost()); 205 web_contents_->GetRenderViewHost());
205 } 206 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698