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

Unified Diff: chrome/browser/ui/cocoa/external_protocol_dialog_views_mac.mm

Issue 2632653002: MacViews: Enable views based External Protocol dialog behind secondary-ui-md flag. (Closed)
Patch Set: Address review. Created 3 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/external_protocol_dialog_views_mac.mm
diff --git a/chrome/browser/ui/cocoa/external_protocol_dialog_views_mac.mm b/chrome/browser/ui/cocoa/external_protocol_dialog_views_mac.mm
new file mode 100644
index 0000000000000000000000000000000000000000..9caa71e210abe8b67bcc848ab904ed9666b11b45
--- /dev/null
+++ b/chrome/browser/ui/cocoa/external_protocol_dialog_views_mac.mm
@@ -0,0 +1,51 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/external_protocol/external_protocol_handler.h"
+
+#import "chrome/browser/ui/cocoa/external_protocol_dialog.h"
+#include "chrome/browser/ui/external_protocol_dialog_delegate.h"
+#include "chrome/browser/ui/views/external_protocol_dialog.h"
+#include "ui/base/material_design/material_design_controller.h"
+
+namespace {
+
+// Note: This is duplicated from
+// chrome/browser/ui/views/external_protocol_dialog.cc.
+void RunExternalProtocolDialogViews(const GURL& url,
+ int render_process_host_id,
+ int routing_id,
+ ui::PageTransition page_transition,
+ bool has_user_gesture) {
+ std::unique_ptr<ExternalProtocolDialogDelegate> delegate(
+ new ExternalProtocolDialogDelegate(url, render_process_host_id,
+ routing_id));
+ if (delegate->program_name().empty()) {
+ // ShellExecute won't do anything. Don't bother warning the user.
+ return;
+ }
+
+ // Windowing system takes ownership.
+ new ExternalProtocolDialog(std::move(delegate), render_process_host_id,
+ routing_id);
+}
+
+} // namespace
+
+// static
+void ExternalProtocolHandler::RunExternalProtocolDialog(
+ const GURL& url,
+ int render_process_host_id,
+ int routing_id,
+ ui::PageTransition page_transition,
+ bool has_user_gesture) {
+ if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
+ RunExternalProtocolDialogViews(url, render_process_host_id, routing_id,
+ page_transition, has_user_gesture);
+ return;
+ }
+ [[ExternalProtocolDialogController alloc] initWithGURL:&url
+ renderProcessHostId:render_process_host_id
+ routingId:routing_id];
+}

Powered by Google App Engine
This is Rietveld 408576698