OLD | NEW |
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 #import "chrome/browser/ui/cocoa/external_protocol_dialog.h" | 5 #import "chrome/browser/ui/cocoa/external_protocol_dialog.h" |
6 | 6 |
7 #include "base/message_loop/message_loop.h" | 7 #include "base/message_loop/message_loop.h" |
8 #include "base/metrics/histogram.h" | 8 #include "base/metrics/histogram.h" |
9 #include "base/strings/string_util.h" | 9 #include "base/strings/string_util.h" |
10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
11 #include "chrome/browser/external_protocol/external_protocol_handler.h" | 11 #include "chrome/browser/external_protocol/external_protocol_handler.h" |
12 #include "chrome/browser/shell_integration.h" | 12 #include "chrome/browser/shell_integration.h" |
13 #include "chrome/grit/chromium_strings.h" | 13 #include "chrome/grit/chromium_strings.h" |
14 #include "chrome/grit/generated_resources.h" | 14 #include "chrome/grit/generated_resources.h" |
15 #include "ui/base/l10n/l10n_util_mac.h" | 15 #include "ui/base/l10n/l10n_util_mac.h" |
16 #include "ui/gfx/text_elider.h" | 16 #include "ui/gfx/text_elider.h" |
17 | 17 |
18 /////////////////////////////////////////////////////////////////////////////// | 18 /////////////////////////////////////////////////////////////////////////////// |
19 // ExternalProtocolHandler | 19 // ExternalProtocolHandler |
20 | 20 |
21 // static | 21 // static |
22 void ExternalProtocolHandler::RunExternalProtocolDialog( | 22 void ExternalProtocolHandler::RunExternalProtocolDialog( |
23 const GURL& url, int render_process_host_id, int routing_id) { | 23 const GURL& url, int render_process_host_id, int routing_id, |
| 24 ui::PageTransition page_transition, bool has_user_gesture) { |
24 [[ExternalProtocolDialogController alloc] initWithGURL:&url | 25 [[ExternalProtocolDialogController alloc] initWithGURL:&url |
25 renderProcessHostId:render_process_host_id | 26 renderProcessHostId:render_process_host_id |
26 routingId:routing_id]; | 27 routingId:routing_id]; |
27 } | 28 } |
28 | 29 |
29 /////////////////////////////////////////////////////////////////////////////// | 30 /////////////////////////////////////////////////////////////////////////////// |
30 // ExternalProtocolDialogController | 31 // ExternalProtocolDialogController |
31 | 32 |
32 @interface ExternalProtocolDialogController(Private) | 33 @interface ExternalProtocolDialogController(Private) |
33 - (void)alertEnded:(NSAlert *)alert | 34 - (void)alertEnded:(NSAlert *)alert |
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
134 base::Time::Now() - creation_time_); | 135 base::Time::Now() - creation_time_); |
135 | 136 |
136 ExternalProtocolHandler::LaunchUrlWithoutSecurityCheck( | 137 ExternalProtocolHandler::LaunchUrlWithoutSecurityCheck( |
137 url_, render_process_host_id_, routing_id_); | 138 url_, render_process_host_id_, routing_id_); |
138 } | 139 } |
139 | 140 |
140 [self autorelease]; | 141 [self autorelease]; |
141 } | 142 } |
142 | 143 |
143 @end | 144 @end |
OLD | NEW |