MacViews: Use native certificate viewer in MacViews browser.

chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_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/constrained_window/constrained_window_sheet_controller.h"
 
 #include <map>
 
 #include "base/logging.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet.h"
 #include "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_info.h"
-#import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
 
 namespace {
 
 // Maps parent windows to sheet controllers.
 NSMutableDictionary* g_sheetControllers;
 
 // Get a value for the given window that can be used as a key in a dictionary.
 NSValue* GetKeyForParentWindow(NSWindow* parent_window) {
   return [NSValue valueWithNonretainedObject:parent_window];
 }
 
+// Returns the bounds to use when showing a sheet for a given parent view. This
+// returns a rect in window coordinates.
+NSRect GetSheetParentBoundsForParentView(NSView* view) {
+  // If the devtools view is open, it shrinks the size of the WebContents, so go
+  // up the hierarchy to the devtools container view to avoid that. Note that
+  // the devtools view is always in the hierarchy even if it is not open or it
+  // is detached.
+  NSView* devtools_view = [[[view superview] superview] superview];
+  if (devtools_view) {
+    return [devtools_view convertRect:[devtools_view bounds] toView:nil];
+  } else {

[tapted, 2015/04/02 04:35:22]

hm - I see you're just moving this, but this fails the 'no else after return'
style guide test.

should be

  if (devtools_view)
    return [devtools_view convertRect:[devtools_view bounds] toView:nil];
  return [view convertRect:[view bounds] toView:nil];

or

  return devtools_view
      ? [devtools_view convertRect:[devtools_view bounds] toView:nil]
      : [view convertRect:[view bounds] toView:nil];

or

  if (devtools_view)
    view = devtools_view;
  return [view convertRect:[view bounds] toView:nil];

[Andre, 2015/04/02 17:17:31]

Done.

+    return [view convertRect:[view bounds] toView:nil];
+  }
+}
+
 }  // namespace
 
 // An invisible overlay window placed on top of the sheet's parent view.
 // This window blocks interaction with the underlying view.
 @interface CWSheetOverlayWindow : NSWindow {
   base::scoped_nsobject<ConstrainedWindowSheetController> controller_;
 }
 @end
 
 @interface ConstrainedWindowSheetController ()
@@ skipping 259 matching lines @@
                 name:NSWindowDidResizeNotification
               object:parentWindow_];
 
   [parentWindow_ removeChildWindow:[info overlayWindow]];
   [[info sheet] closeSheetWithAnimation:withAnimation];
   [[info overlayWindow] close];
   [sheets_ removeObject:info];
 }
 
 @end