Wire Up ScreenCaptureNotificationUIViews to the Cocoa Browser

BUG=728163

Change-Id: Ib519ec4a7ee122301c1ff17dc2f76cf66e48e465
Reviewed-on: https://chromium-review.googlesource.com/932014
Commit-Queue: Robert Liao <robliao@chromium.org>
Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#541999}

chrome/browser/ui/BUILD.gn

@@ -3273,7 +3273,6 @@ split_static_library("ui") {
           "views/profiles/forced_reauthentication_dialog_view.h",
           "views/profiles/signin_view_controller_delegate_views.cc",
           "views/profiles/signin_view_controller_delegate_views.h",
-          "views/screen_capture_notification_ui_views.cc",
           "views/sync/one_click_signin_dialog_view.cc",
           "views/sync/one_click_signin_dialog_view.h",
           "views/touch_uma/touch_uma.cc",
@@ -3346,6 +3345,7 @@ split_static_library("ui") {
         "views/relaunch_notification/relaunch_recommended_bubble_view.h",
         "views/relaunch_notification/relaunch_required_dialog_view.cc",
         "views/relaunch_notification/relaunch_required_dialog_view.h",
+        "views/screen_capture_notification_ui_views.cc",
       ]
       if (is_mac) {
         sources += [

chrome/browser/ui/cocoa/screen_capture_notification_ui_cocoa.mm

@@ -11,6 +11,7 @@
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
+#include "chrome/browser/ui/cocoa/browser_dialogs_views_mac.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
 #include "skia/ext/skia_utils_mac.h"
@@ -69,17 +70,13 @@ gfx::NativeViewId ScreenCaptureNotificationUICocoa::OnStarted(
 
 std::unique_ptr<ScreenCaptureNotificationUI>
 ScreenCaptureNotificationUI::CreateCocoa(const base::string16& text) {
+  if (chrome::ShowAllDialogsWithViewsToolkit())
+    return nullptr;
+
   return std::unique_ptr<ScreenCaptureNotificationUI>(
       new ScreenCaptureNotificationUICocoa(text));
 }
 
-#if !BUILDFLAG(MAC_VIEWS_BROWSER)
-std::unique_ptr<ScreenCaptureNotificationUI>
-ScreenCaptureNotificationUI::Create(const base::string16& text) {
-  return CreateCocoa(text);
-}
-#endif
-
 @implementation ScreenCaptureNotificationController
 - (id)initWithCallback:(const base::Closure&)stop_callback
                   text:(const base::string16&)text {

chrome/browser/ui/screen_capture_notification_ui.h

@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_UI_SCREEN_CAPTURE_NOTIFICATION_UI_H_
 
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/strings/string16.h"
 #include "build/build_config.h"
 #include "content/public/common/media_stream_request.h"
@@ -14,18 +15,23 @@
 // is being captured.
 class ScreenCaptureNotificationUI : public content::MediaStreamUI {
  public:
-  ~ScreenCaptureNotificationUI() override {}
+  ScreenCaptureNotificationUI() = default;
+  ~ScreenCaptureNotificationUI() override = default;
 
   // Creates platform-specific screen capture notification UI. |text| specifies
   // the text that should be shown in the notification.
   static std::unique_ptr<ScreenCaptureNotificationUI> Create(
       const base::string16& text);
+
+ private:
 #if defined(OS_MACOSX)
-  // Temporary shim for Polychrome. See bottom of first comment in
-  // https://crbug.com/80495 for details.
+  // Returns a ScreenCaptureNotificationUI or nullptr if the Views version
+  // should be used instead.
   static std::unique_ptr<ScreenCaptureNotificationUI> CreateCocoa(
       const base::string16& text);
 #endif
+
+  DISALLOW_COPY_AND_ASSIGN(ScreenCaptureNotificationUI);
 };
 
 #endif  // CHROME_BROWSER_UI_SCREEN_CAPTURE_NOTIFICATION_UI_H_

chrome/browser/ui/views/screen_capture_notification_ui_views.cc

@@ -329,8 +329,9 @@ void ScreenCaptureNotificationUIViews::NotifyStopped() {
 std::unique_ptr<ScreenCaptureNotificationUI>
 ScreenCaptureNotificationUI::Create(const base::string16& text) {
 #if defined(OS_MACOSX)
-  if (views_mode_controller::IsViewsBrowserCocoa())
-    return CreateCocoa(text);
+  std::unique_ptr<ScreenCaptureNotificationUI> cocoa_ui = CreateCocoa(text);
+  if (cocoa_ui)
+    return cocoa_ui;
 #endif
   return std::unique_ptr<ScreenCaptureNotificationUI>(
       new ScreenCaptureNotificationUIViews(text));