MacViews: Enable views based External Protocol dialog behind secondary-ui-md flag.

chrome/browser/ui/views/external_protocol_dialog.cc

 // Copyright (c) 2012 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/ui/views/external_protocol_dialog.h"
 
 #include <utility>
 
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/external_protocol/external_protocol_handler.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/ui/external_protocol_dialog_delegate.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/constrained_window/constrained_window_views.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/base/ui_features.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/views/controls/message_box_view.h"
 #include "ui/views/widget/widget.h"
 
 using content::WebContents;
 
 namespace {
 
 const int kMessageWidth = 400;
 
 }  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
 // ExternalProtocolHandler
 
+#if !defined(OS_MACOSX) || BUILDFLAG(MAC_VIEWS_BROWSER)

[karandeepb, 2017/01/24 06:12:23]

Should we think of having 

#define COCOA_BROWSER #defined(OS_MACOSX) && !BUILDFLAG(MAC_VIEWS_BROWSER)
somewhere

as this pattern becomes more common.

+// This should be kept in sync with RunExternalProtocolDialogViews in
+// external_protocol_dialog_views_mac.mm.
 // static
 void ExternalProtocolHandler::RunExternalProtocolDialog(
     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);
 }
+#endif

[tapted, 2017/01/24 04:02:43]

nit: // !OS_MACOSX || MAC_VIEWS_BROWSER

[karandeepb, 2017/01/24 06:12:23]

Done.

 
 ///////////////////////////////////////////////////////////////////////////////
 // ExternalProtocolDialog
 
 ExternalProtocolDialog::~ExternalProtocolDialog() {
 }
 
 //////////////////////////////////////////////////////////////////////////////
 // ExternalProtocolDialog, views::DialogDelegate implementation:
 
@@ skipping 83 matching lines @@
   message_box_view_ = new views::MessageBoxView(params);
   message_box_view_->SetCheckBoxLabel(delegate_->GetCheckboxText());
 
   WebContents* web_contents = tab_util::GetWebContentsByID(
       render_process_host_id_, routing_id_);
   // Only launch the dialog if there is a web contents associated with the
   // request.
   if (web_contents)
     constrained_window::ShowWebModalDialogViews(this, web_contents);
 }