MacViews: Allow toolkit-views for "Global Error" bubbles.

chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 
 #include <algorithm>
 
 #include "base/mac/bundle_locations.h"
 #include "base/mac/foundation_util.h"
@@ skipping 947 matching lines @@
     [locationBar_ animateToFrame:locationFrame];
   else
     [locationBar_ setFrame:locationFrame];
 }
 
 - (NSPoint)bookmarkBubblePoint {
   if (locationBarView_->IsStarEnabled())
     return locationBarView_->GetBubblePointForDecoration(
         locationBarView_->star_decoration());
 
-  // Grab bottom middle of hotdogs.
-  NSRect frame = appMenuButton_.frame;
-  NSPoint point = NSMakePoint(NSMidX(frame), NSMinY(frame));
-  // Inset to account for the whitespace around the hotdogs.
-  point.y += app_menu_controller::kAppMenuBubblePointOffsetY;
-  return [self.view convertPoint:point toView:nil];
+  return [self appMenuBubblePoint];
 }
 
 - (NSPoint)saveCreditCardBubblePoint {
   return locationBarView_->GetSaveCreditCardBubblePoint();
 }
 
+- (NSPoint)appMenuBubblePoint {
+  NSRect frame = appMenuButton_.frame;
+  NSPoint point;
+  if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
+    // Use the bottom right for MD-style anchoring (no arrow).
+    point = NSMakePoint(NSMaxX(frame), NSMinY(frame));
+  } else {
+    // Grab bottom middle of hotdogs.
+    point = NSMakePoint(NSMidX(frame), NSMinY(frame));
+    // Inset to account for the whitespace around the hotdogs.
+    point.y += app_menu_controller::kAppMenuBubblePointOffsetY;
+  }
+  return [self.view convertPoint:point toView:nil];
+}
+
 - (CGFloat)baseToolbarHeight {
   // Height of the toolbar in pixels when the bookmark bar is closed.
   const CGFloat kBaseToolbarHeightNormal = 37;
   return kBaseToolbarHeightNormal;
 }
 
 - (CGFloat)desiredHeightForCompression:(CGFloat)compressByHeight {
   // With no toolbar, just ignore the compression.
   if (!hasToolbar_)
     return NSHeight([locationBar_ frame]);
@@ skipping 92 matching lines @@
 - (void)hideDropURLsIndicatorInView:(NSView*)view {
   // Do nothing.
 }
 
 // (URLDropTargetController protocol)
 - (BOOL)isUnsupportedDropData:(id<NSDraggingInfo>)info {
   return drag_util::IsUnsupportedDropData(profile_, info);
 }
 
 @end