MacViews: Allows the toolkit-views Manage Passwords Dialog to be used

chrome/browser/ui/cocoa/passwords/passwords_bubble_cocoa.mm

 // Copyright 2014 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.
 
 #import "chrome/browser/ui/cocoa/passwords/passwords_bubble_cocoa.h"
 
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_block.h"
 #include "chrome/browser/ui/browser_finder.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
 #include "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 #include "chrome/browser/ui/cocoa/location_bar/manage_passwords_decoration.h"
 #import "chrome/browser/ui/cocoa/passwords/passwords_bubble_controller.h"
 #include "chrome/browser/ui/passwords/manage_passwords_icon.h"
 #include "chrome/browser/ui/passwords/passwords_model_delegate.h"
 #include "content/public/browser/web_contents.h"
+#include "ui/base/material_design/material_design_controller.h"
 
 typedef void (^Callback)(void);
 
 @interface ManagePasswordsBubbleCocoaNotificationBridge : NSObject {
   base::mac::ScopedBlock<Callback> callback_;
 }
 - (id)initWithCallback:(Callback)callback;
 - (void)onClose;
 @end
 
@@ skipping 74 matching lines @@
   Close(false);
 }
 
 void ManagePasswordsBubbleCocoa::OnClose() {
   delete this;
 }
 
 // static
 void ManagePasswordsBubbleCocoa::Show(content::WebContents* webContents,
                                       bool user_action) {
+  if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {

[tapted, 2017/04/11 07:48:58]

I think it's fine to move this down to line 140 so the next few lines aren't
repeated. (sure bubble_ should always be null with --secondary-ui-md, even when
showing, but that's OK)

[varkha, 2017/04/12 01:57:28]

Done.

+    NSWindow* window = [webContents->GetNativeView() window];
+    if (!window) {
+      // The tab isn't active right now.
+      return;
+    }
+    BrowserWindowController* bwc =
+        [BrowserWindowController browserWindowControllerForWindow:window];
+    NSPoint ns_point = [bwc bookmarkBubblePoint];

[tapted, 2017/04/11 07:48:58]

nit: ns_point -> anchor?

[varkha, 2017/04/12 01:57:28]

Done.

+    ShowManagePasswordsBubbleOnCocoaBrowser(ns_point, webContents, user_action);
+    return;
+  }
+
   if (bubble_) {
     // The bubble is currently shown. It's to be reopened with the new content.
     // Disable closing animation so that it's destroyed immediately.
     bubble_->Close(true);
   }
   DCHECK(!bubble_);
 
   NSWindow* window = [webContents->GetNativeView() window];
   if (!window) {
     // The tab isn't active right now.
     return;
   }
   BrowserWindowController* bwc =
       [BrowserWindowController browserWindowControllerForWindow:window];
   bubble_ = new ManagePasswordsBubbleCocoa(
       webContents, user_action ? ManagePasswordsBubbleModel::USER_ACTION
                                : ManagePasswordsBubbleModel::AUTOMATIC,
       [bwc locationBarBridge]->manage_passwords_decoration()->icon());
 
   bubble_->Show(user_action);
 }