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

chrome/browser/ui/cocoa/global_error_bubble_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/global_error_bubble_controller.h"
 
 #include "base/logging.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #import "chrome/browser/ui/browser.h"
 #import "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/app_menu/app_menu_controller.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
 #import "chrome/browser/ui/cocoa/l10n_util.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #include "chrome/browser/ui/global_error/global_error.h"
 #include "chrome/browser/ui/global_error/global_error_bubble_view_base.h"
 #include "chrome/browser/ui/global_error/global_error_service.h"
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
 #include "components/search_engines/util.h"
 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #import "ui/base/cocoa/a11y_util.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/base/material_design/material_design_controller.h"
 #include "ui/gfx/image/image.h"
 
 namespace {
+
 const CGFloat kParagraphSpacing = 6;
+
+ToolbarController* ToolbarControllerForBrowser(Browser* browser) {
+  NSWindow* parent_window = browser->window()->GetNativeWindow();
+  BrowserWindowController* bwc =
+      [BrowserWindowController browserWindowControllerForWindow:parent_window];
+  return [bwc toolbarController];
+}
+
 } // namespace
 
 namespace GlobalErrorBubbleControllerInternal {
 
 // This is the bridge to the C++ GlobalErrorBubbleViewBase object.
 class Bridge : public GlobalErrorBubbleViewBase {
  public:
   Bridge(GlobalErrorBubbleController* controller) : controller_(controller) {
   }
 
  private:
   void CloseBubbleView() override { [controller_ close]; }
 
   GlobalErrorBubbleController* controller_;  // Weak, owns this.
 };
 
 }  // namespace GlobalErrorBubbleControllerInternal
 
 @implementation GlobalErrorBubbleController
 
 + (GlobalErrorBubbleViewBase*)showForBrowser:(Browser*)browser
     error:(const base::WeakPtr<GlobalErrorWithStandardBubble>&)error {
-  NSWindow* parentWindow = browser->window()->GetNativeWindow();
-  BrowserWindowController* bwc = [BrowserWindowController
-      browserWindowControllerForWindow:parentWindow];
-  NSView* appMenuButton = [[bwc toolbarController] appMenuButton];
+  NSView* appMenuButton = [ToolbarControllerForBrowser(browser) appMenuButton];
   NSPoint offset = NSMakePoint(
       NSMidX([appMenuButton bounds]),
       app_menu_controller::kAppMenuBubblePointOffsetY);
 
   // The bubble will be automatically deleted when the window is closed.
   GlobalErrorBubbleController* bubble = [[GlobalErrorBubbleController alloc]
       initWithWindowNibPath:@"GlobalErrorBubble"
              relativeToView:appMenuButton
                      offset:offset];
   bubble->error_ = error;
@@ skipping 90 matching lines @@
   if (error_)
     error_->BubbleViewCancelButtonPressed(browser_);
   [self close];
 }
 
 @end
 
 GlobalErrorBubbleViewBase* GlobalErrorBubbleViewBase::ShowStandardBubbleView(
     Browser* browser,
     const base::WeakPtr<GlobalErrorWithStandardBubble>& error) {
-  return [GlobalErrorBubbleController showForBrowser:browser error:error];
+  if (!ui::MaterialDesignController::IsSecondaryUiMaterial())
+    return [GlobalErrorBubbleController showForBrowser:browser error:error];
+
+  NSPoint ns_point = [ToolbarControllerForBrowser(browser) appMenuBubblePoint];
+  return ShowViewsGlobalErrorBubbleOnCocoaBrowser(ns_point, browser, error);
 }