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

Side by Side Diff: chrome/browser/extensions/extension_host.cc

Issue 12082123: Rename JavaScriptDialogCreator to JavaScriptDialogManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 10 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 #include "chrome/browser/extensions/extension_host.h" 5 #include "chrome/browser/extensions/extension_host.h"
6 6
7 #include <list> 7 #include <list>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/memory/singleton.h" 10 #include "base/memory/singleton.h"
11 #include "base/memory/weak_ptr.h" 11 #include "base/memory/weak_ptr.h"
12 #include "base/message_loop.h" 12 #include "base/message_loop.h"
13 #include "base/metrics/histogram.h" 13 #include "base/metrics/histogram.h"
14 #include "base/string_util.h" 14 #include "base/string_util.h"
15 #include "base/utf_string_conversions.h" 15 #include "base/utf_string_conversions.h"
16 #include "chrome/browser/browser_shutdown.h" 16 #include "chrome/browser/browser_shutdown.h"
17 #include "chrome/browser/extensions/event_router.h" 17 #include "chrome/browser/extensions/event_router.h"
18 #include "chrome/browser/extensions/extension_process_manager.h" 18 #include "chrome/browser/extensions/extension_process_manager.h"
19 #include "chrome/browser/extensions/extension_service.h" 19 #include "chrome/browser/extensions/extension_service.h"
20 #include "chrome/browser/extensions/extension_system.h" 20 #include "chrome/browser/extensions/extension_system.h"
21 #include "chrome/browser/extensions/extension_tab_util.h" 21 #include "chrome/browser/extensions/extension_tab_util.h"
22 #include "chrome/browser/extensions/window_controller.h" 22 #include "chrome/browser/extensions/window_controller.h"
23 #include "chrome/browser/file_select_helper.h" 23 #include "chrome/browser/file_select_helper.h"
24 #include "chrome/browser/intents/web_intents_util.h" 24 #include "chrome/browser/intents/web_intents_util.h"
25 #include "chrome/browser/media/media_capture_devices_dispatcher.h" 25 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
26 #include "chrome/browser/profiles/profile.h" 26 #include "chrome/browser/profiles/profile.h"
27 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_creator.h" 27 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h"
28 #include "chrome/browser/ui/browser.h" 28 #include "chrome/browser/ui/browser.h"
29 #include "chrome/browser/ui/browser_finder.h" 29 #include "chrome/browser/ui/browser_finder.h"
30 #include "chrome/browser/ui/browser_list.h" 30 #include "chrome/browser/ui/browser_list.h"
31 #include "chrome/browser/ui/browser_window.h" 31 #include "chrome/browser/ui/browser_window.h"
32 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" 32 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
33 #include "chrome/browser/view_type_utils.h" 33 #include "chrome/browser/view_type_utils.h"
34 #include "chrome/common/chrome_constants.h" 34 #include "chrome/common/chrome_constants.h"
35 #include "chrome/common/chrome_notification_types.h" 35 #include "chrome/common/chrome_notification_types.h"
36 #include "chrome/common/extensions/extension.h" 36 #include "chrome/common/extensions/extension.h"
37 #include "chrome/common/extensions/extension_constants.h" 37 #include "chrome/common/extensions/extension_constants.h"
(...skipping 549 matching lines...) Expand 10 before | Expand all | Expand 10 after
587 } 587 }
588 588
589 void ExtensionHost::RenderViewDeleted(RenderViewHost* render_view_host) { 589 void ExtensionHost::RenderViewDeleted(RenderViewHost* render_view_host) {
590 // If our RenderViewHost is deleted, fall back to the host_contents' current 590 // If our RenderViewHost is deleted, fall back to the host_contents' current
591 // RVH. There is sometimes a small gap between the pending RVH being deleted 591 // RVH. There is sometimes a small gap between the pending RVH being deleted
592 // and RenderViewCreated being called, so we update it here. 592 // and RenderViewCreated being called, so we update it here.
593 if (render_view_host == render_view_host_) 593 if (render_view_host == render_view_host_)
594 render_view_host_ = host_contents_->GetRenderViewHost(); 594 render_view_host_ = host_contents_->GetRenderViewHost();
595 } 595 }
596 596
597 content::JavaScriptDialogCreator* ExtensionHost::GetJavaScriptDialogCreator() { 597 content::JavaScriptDialogManager* ExtensionHost::GetJavaScriptDialogManager() {
598 if (!dialog_creator_.get()) { 598 if (!dialog_manager_.get()) {
599 dialog_creator_.reset(CreateJavaScriptDialogCreatorInstance(this)); 599 dialog_manager_.reset(CreateJavaScriptDialogManagerInstance(this));
600 } 600 }
601 return dialog_creator_.get(); 601 return dialog_manager_.get();
602 } 602 }
603 603
604 void ExtensionHost::RunFileChooser(WebContents* tab, 604 void ExtensionHost::RunFileChooser(WebContents* tab,
605 const content::FileChooserParams& params) { 605 const content::FileChooserParams& params) {
606 FileSelectHelper::RunFileChooser(tab, params); 606 FileSelectHelper::RunFileChooser(tab, params);
607 } 607 }
608 608
609 void ExtensionHost::AddNewContents(WebContents* source, 609 void ExtensionHost::AddNewContents(WebContents* source,
610 WebContents* new_contents, 610 WebContents* new_contents,
611 WindowOpenDisposition disposition, 611 WindowOpenDisposition disposition,
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
657 content::IsAudioMediaType(request.audio_type), 657 content::IsAudioMediaType(request.audio_type),
658 content::IsVideoMediaType(request.video_type), 658 content::IsVideoMediaType(request.video_type),
659 &devices); 659 &devices);
660 660
661 // For tab capture device, we require the tabCapture permission. 661 // For tab capture device, we require the tabCapture permission.
662 RequestMediaAccessPermissionHelper::AuthorizeRequest( 662 RequestMediaAccessPermissionHelper::AuthorizeRequest(
663 devices, request, callback, extension(), false); 663 devices, request, callback, extension(), false);
664 } 664 }
665 665
666 } // namespace extensions 666 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_host.h ('k') | chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698