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

Side by Side Diff: chrome/browser/ui/views/external_tab_container_win.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/ui/views/external_tab_container_win.h" 5 #include "chrome/browser/ui/views/external_tab_container_win.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 12 matching lines...) Expand all
23 #include "chrome/browser/devtools/devtools_toggle_action.h" 23 #include "chrome/browser/devtools/devtools_toggle_action.h"
24 #include "chrome/browser/devtools/devtools_window.h" 24 #include "chrome/browser/devtools/devtools_window.h"
25 #include "chrome/browser/file_select_helper.h" 25 #include "chrome/browser/file_select_helper.h"
26 #include "chrome/browser/history/history_tab_helper.h" 26 #include "chrome/browser/history/history_tab_helper.h"
27 #include "chrome/browser/history/history_types.h" 27 #include "chrome/browser/history/history_types.h"
28 #include "chrome/browser/intents/register_intent_handler_infobar_delegate.h" 28 #include "chrome/browser/intents/register_intent_handler_infobar_delegate.h"
29 #include "chrome/browser/pepper_broker_infobar_delegate.h" 29 #include "chrome/browser/pepper_broker_infobar_delegate.h"
30 #include "chrome/browser/profiles/profile.h" 30 #include "chrome/browser/profiles/profile.h"
31 #include "chrome/browser/repost_form_warning_controller.h" 31 #include "chrome/browser/repost_form_warning_controller.h"
32 #include "chrome/browser/themes/theme_service.h" 32 #include "chrome/browser/themes/theme_service.h"
33 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_creator.h" 33 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h"
34 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h" 34 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"
35 #include "chrome/browser/ui/browser.h" 35 #include "chrome/browser/ui/browser.h"
36 #include "chrome/browser/ui/browser_tab_contents.h" 36 #include "chrome/browser/ui/browser_tab_contents.h"
37 #include "chrome/browser/ui/browser_window.h" 37 #include "chrome/browser/ui/browser_window.h"
38 #include "chrome/browser/ui/media_stream_infobar_delegate.h" 38 #include "chrome/browser/ui/media_stream_infobar_delegate.h"
39 #include "chrome/browser/ui/tab_modal_confirm_dialog.h" 39 #include "chrome/browser/ui/tab_modal_confirm_dialog.h"
40 #include "chrome/browser/ui/views/infobars/infobar_container_view.h" 40 #include "chrome/browser/ui/views/infobars/infobar_container_view.h"
41 #include "chrome/browser/ui/views/tab_contents/render_view_context_menu_win.h" 41 #include "chrome/browser/ui/views/tab_contents/render_view_context_menu_win.h"
42 #include "chrome/common/automation_messages.h" 42 #include "chrome/common/automation_messages.h"
43 #include "chrome/common/chrome_constants.h" 43 #include "chrome/common/chrome_constants.h"
(...skipping 643 matching lines...) Expand 10 before | Expand all | Expand 10 after
687 RenderViewHost* render_view_host) { 687 RenderViewHost* render_view_host) {
688 // Undo the resource automation registration performed in 688 // Undo the resource automation registration performed in
689 // ExternalTabContainerWin::RegisterRenderViewHost. 689 // ExternalTabContainerWin::RegisterRenderViewHost.
690 if (render_view_host) { 690 if (render_view_host) {
691 AutomationResourceMessageFilter::UnRegisterRenderView( 691 AutomationResourceMessageFilter::UnRegisterRenderView(
692 render_view_host->GetProcess()->GetID(), 692 render_view_host->GetProcess()->GetID(),
693 render_view_host->GetRoutingID()); 693 render_view_host->GetRoutingID());
694 } 694 }
695 } 695 }
696 696
697 content::JavaScriptDialogCreator* 697 content::JavaScriptDialogManager*
698 ExternalTabContainerWin::GetJavaScriptDialogCreator() { 698 ExternalTabContainerWin::GetJavaScriptDialogManager() {
699 return GetJavaScriptDialogCreatorInstance(); 699 return GetJavaScriptDialogManagerInstance();
700 } 700 }
701 701
702 bool ExternalTabContainerWin::HandleContextMenu( 702 bool ExternalTabContainerWin::HandleContextMenu(
703 const content::ContextMenuParams& params) { 703 const content::ContextMenuParams& params) {
704 if (!automation_) { 704 if (!automation_) {
705 NOTREACHED(); 705 NOTREACHED();
706 return false; 706 return false;
707 } 707 }
708 708
709 if (params.custom_context.is_pepper_menu) 709 if (params.custom_context.is_pepper_menu)
(...skipping 584 matching lines...) Expand 10 before | Expand all | Expand 10 after
1294 if (params.disposition == CURRENT_TAB) { 1294 if (params.disposition == CURRENT_TAB) {
1295 DCHECK(route_all_top_level_navigations_); 1295 DCHECK(route_all_top_level_navigations_);
1296 forward_params.disposition = NEW_FOREGROUND_TAB; 1296 forward_params.disposition = NEW_FOREGROUND_TAB;
1297 } 1297 }
1298 WebContents* new_contents = 1298 WebContents* new_contents =
1299 ExternalTabContainerWin::OpenURLFromTab(source, forward_params); 1299 ExternalTabContainerWin::OpenURLFromTab(source, forward_params);
1300 // support only one navigation for a dummy tab before it is killed. 1300 // support only one navigation for a dummy tab before it is killed.
1301 ::DestroyWindow(GetNativeView()); 1301 ::DestroyWindow(GetNativeView());
1302 return new_contents; 1302 return new_contents;
1303 } 1303 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/external_tab_container_win.h ('k') | chrome/browser/ui/views/tabs/tab_drag_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698