Mac: Start removing Cocoa fullscreen code.

chrome/browser/ui/cocoa/browser/exclusive_access_controller_views.mm

 // Copyright 2016 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/browser/exclusive_access_controller_views.h"
 
 #include "chrome/browser/download/download_shelf.h"
 #include "chrome/browser/fullscreen.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/cocoa/accelerators_cocoa.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
-#import "chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller.h"

[tapted, 2016/05/25 03:53:27]

Delete exclusive_access_bubble_window_controller.h and
exclusive_access_bubble_window_controller.mm? (and
exclusive_access_bubble_window_controller_unittest.mm). Nothing else calls
[ExclusiveAccessBubbleWindowController alloc] after this.

There's a #import in browser_window_controller.h but I think you can just delete
it.

edit: ah, I see you have this in a follow-up. Cool.

[Matt Giuca, 2016/05/26 04:15:40]

Acknowledged.

 #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h"
 #include "chrome/browser/ui/status_bubble.h"
 #include "chrome/browser/ui/views/exclusive_access_bubble_views.h"
 #include "chrome/common/pref_names.h"
 #include "components/prefs/pref_service.h"
 #include "ui/base/cocoa/cocoa_base_utils.h"
 #import "ui/gfx/mac/coordinate_conversion.h"
 
 ExclusiveAccessController::ExclusiveAccessController(
     BrowserWindowController* controller,
     Browser* browser)
     : controller_(controller),
       browser_(browser),
       bubble_type_(EXCLUSIVE_ACCESS_BUBBLE_TYPE_NONE) {
   pref_registrar_.Init(GetProfile()->GetPrefs());
   pref_registrar_.Add(
       prefs::kShowFullscreenToolbar,
       base::Bind(&ExclusiveAccessController::UpdateFullscreenToolbar,
                  base::Unretained(this)));
 }
 
 ExclusiveAccessController::~ExclusiveAccessController() {}
 
 void ExclusiveAccessController::Show() {
-  if (ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled()) {
-    views_bubble_.reset(
-        new ExclusiveAccessBubbleViews(this, url_, bubble_type_));
-    return;
-  }
-
-  [cocoa_bubble_ closeImmediately];
-  cocoa_bubble_.reset([[ExclusiveAccessBubbleWindowController alloc]
-                 initWithOwner:controller_
-      exclusive_access_manager:browser_->exclusive_access_manager()
-                       profile:browser_->profile()
-                           url:url_
-                    bubbleType:bubble_type_]);
-  [cocoa_bubble_ showWindow];
+  views_bubble_.reset(new ExclusiveAccessBubbleViews(this, url_, bubble_type_));
+  return;

[scheib, 2016/05/24 19:43:47]

return; not needed.

[Matt Giuca, 2016/05/26 04:15:40]

Done.

 }
 
 void ExclusiveAccessController::Destroy() {
   views_bubble_.reset();
-  [cocoa_bubble_ closeImmediately];
-  cocoa_bubble_.reset();
   url_ = GURL();
   bubble_type_ = EXCLUSIVE_ACCESS_BUBBLE_TYPE_NONE;
 }
 
 void ExclusiveAccessController::Layout(CGFloat max_y) {
   if (views_bubble_)
     views_bubble_->RepositionIfVisible();
-  [cocoa_bubble_ positionInWindowAtTop:max_y];
 }
 
 Profile* ExclusiveAccessController::GetProfile() {
   return browser_->profile();
 }
 
 bool ExclusiveAccessController::IsFullscreen() const {
   return [controller_ isInAnyFullscreenMode];
 }
 
@@ skipping 72 matching lines @@
   *accelerator =
       *AcceleratorsCocoa::GetInstance()->GetAcceleratorForCommand(cmd_id);
   return true;
 }
 
 ExclusiveAccessManager* ExclusiveAccessController::GetExclusiveAccessManager() {
   return browser_->exclusive_access_manager();
 }
 
 views::Widget* ExclusiveAccessController::GetBubbleAssociatedWidget() {
   NOTREACHED();  // Only used for non-simplified UI.

[tapted, 2016/05/25 03:53:27]

Can this be hit now? That is, if we're partially adding back cursor tracking to
re-show the bubble at the screen edge, Mac should still be excluded, since that
bit isn't plumbed through here. Maybe we should first hardcode
IsSimplifiedFullscreenUIEnabled() on Mac with #ifdefs so that the flag can't be
disabled at all on Mac

[Matt Giuca, 2016/05/26 04:15:40]

I haven't actually tested this (outside of running try bots). Would you be able
to patch it and see if it works with the flag disabled? If it does work on Mac
then there's no harm in keeping it. If not, yeah I'll just send out a
preliminary CL to remove the flag on Mac.

[tapted, 2016/05/26 05:08:41]

It crash:

[21133:1295:0526/150654:FATAL:exclusive_access_controller_views.mm(140)] Check
failed: false.
0   libbase.dylib                       0x000000011e3b3ecf
_ZN4base5debug10StackTraceC2Ev + 47
1   libbase.dylib                       0x000000011e3b3f93
_ZN4base5debug10StackTraceC1Ev + 35
2   libbase.dylib                       0x000000011e4463f0
_ZN7logging10LogMessageD2Ev + 80
3   libbase.dylib                       0x000000011e443c33
_ZN7logging10LogMessageD1Ev + 35
4   libchrome_main_dll.dylib            0x00000001118a02fe
_ZN25ExclusiveAccessController25GetBubbleAssociatedWidgetEv + 174
5   libchrome_main_dll.dylib            0x00000001118a037a
_ZThn16_N25ExclusiveAccessController25GetBubbleAssociatedWidgetEv + 42
6   libchrome_main_dll.dylib            0x00000001116b0d06
_ZN26ExclusiveAccessBubbleViews14IsWindowActiveEv + 54
7   libchrome_main_dll.dylib            0x0000000111c64265
_ZN21ExclusiveAccessBubble18CheckMousePositionEv + 341
8   libchrome_main_dll.dylib            0x0000000111c6586e
_ZN4base8internal15RunnableAdapterIM21ExclusiveAccessBubbleFvvEE3RunIPS2_JEEEvOT_DpOT0_
+ 126

[Matt Giuca, 2016/05/26 05:57:30]

OK. Sent out a CL to disable the flag on Mac which should land before this.
https://codereview.chromium.org/2012763005

Reworded the CL description (now this CL has no visible behaviour change).

   return nullptr;
 }
 
 ui::AcceleratorProvider* ExclusiveAccessController::GetAcceleratorProvider() {
   return this;
 }
 
 gfx::NativeView ExclusiveAccessController::GetBubbleParentView() const {
   return [[controller_ window] contentView];
 }
@@ skipping 15 matching lines @@
 }
 
 gfx::Rect ExclusiveAccessController::GetTopContainerBoundsInScreen() {
   NOTREACHED();  // Only used for ImmersiveMode.
   return gfx::Rect();
 }
 
 BrowserWindow* ExclusiveAccessController::GetBrowserWindow() const {
   return [controller_ browserWindow];
 }