Revert 132144 - Broke ASAN

chrome/browser/ui/panels/panel_window_controller_cocoa.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.
 
 #include "chrome/browser/ui/panels/panel_window_controller_cocoa.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/auto_reset.h"
 #include "base/logging.h"
@@ skipping 1002 matching lines @@
   else
     [NSApp deactivate];
 }
 
 - (void)preventBecomingKeyWindow:(BOOL)prevent {
   canBecomeKeyWindow_ = !prevent;
 }
 
 - (void)fullScreenModeChanged:(bool)isFullScreen {
   [self updateWindowLevel];
-
-  // The full-screen window is in normal level and changing the panel window to
-  // same normal level will not move it below the full-screen window. Thus we
-  // need to reorder the panel window.
-  if (isFullScreen)
-    [[self window] orderBack:nil];
-  else
-    [[self window] orderFrontRegardless];
 }
 
 - (BOOL)canBecomeKeyWindow {
   // Panel can only gain focus if it is expanded. Minimized panels do not
   // participate in Cmd-~ rotation.
   // TODO(dimich): If it will be ever desired to expand/focus the Panel on
   // keyboard navigation or via main menu, the care should be taken to avoid
   // cases when minimized Panel is getting keyboard input, invisibly.
   return canBecomeKeyWindow_;
 }
 
 - (int)numPanels {
   return windowShim_->panel()->manager()->num_panels();
 }
 
 - (BOOL)activationRequestedByBrowser {
   return windowShim_->ActivationRequestedByBrowser();
 }
 
 - (void)updateWindowLevel {
   if (![self isWindowLoaded])
     return;
   // Make sure we don't draw on top of a window in full screen mode.
-  Panel* panel = windowShim_->panel();
-  if (panel->manager()->display_settings_provider()->is_full_screen() ||
-      !panel->always_on_top()) {
+  if (windowShim_->panel()->manager()->is_full_screen() ||
+      !windowShim_->panel()->always_on_top()) {
     [[self window] setLevel:NSNormalWindowLevel];
     return;
   }
   // If we simply use NSStatusWindowLevel (25) for all docked panel windows,
   // IME composition windows for things like CJK languages appear behind panels.
   // Pre 10.7, IME composition windows have a window level of 19, which is
   // lower than the dock at level 20. Since we want panels to appear on top of
   // the dock, it is impossible to enforce an ordering where IME > panel > dock,
   // since IME < dock.
   // On 10.7, IME composition windows and the dock both live at level 20, so we
   // use the same window level for panels. Since newly created windows appear at
   // the top of their window level, panels are typically on top of the dock, and
   // the IME composition window correctly draws over the panel.
   // An autohide dock causes problems though: since it's constantly being
   // revealed, it ends up drawing on top of other windows at the same level.
   // While this is OK for expanded panels, it makes minimized panels impossible
   // to activate. As a result, we still use NSStatusWindowLevel for minimized
   // panels, since it's impossible to compose IME text in them anyway.
-  if (panel->IsMinimized()) {
+  if (windowShim_->panel()->IsMinimized()) {
     [[self window] setLevel:NSStatusWindowLevel];
     return;
   }
   [[self window] setLevel:NSDockWindowLevel];
 }
 
 - (void)enableResizeByMouse:(BOOL)enable {
   if (![self isWindowLoaded])
     return;
   [[self window] invalidateCursorRectsForView:overlayView_];
 }
 
 - (BOOL)isActivationByClickingTitlebarEnabled {
   return !windowShim_->panel()->always_on_top();
 }
 
 @end