| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/wm/custom_frame_view_ash.h" | 5 #include "ash/wm/custom_frame_view_ash.h" |
| 6 | 6 |
| 7 #include "ash/ash_switches.h" | 7 #include "ash/ash_switches.h" |
| 8 #include "ash/wm/caption_buttons/frame_caption_button_container_view.h" | 8 #include "ash/wm/caption_buttons/frame_caption_button_container_view.h" |
| 9 #include "ash/wm/caption_buttons/frame_maximize_button.h" | 9 #include "ash/wm/caption_buttons/frame_maximize_button.h" |
| 10 #include "ash/wm/caption_buttons/frame_maximize_button_observer.h" | 10 #include "ash/wm/caption_buttons/frame_maximize_button_observer.h" |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 } | 98 } |
| 99 return true; | 99 return true; |
| 100 } | 100 } |
| 101 // Overridden from aura::WindowObserver: | 101 // Overridden from aura::WindowObserver: |
| 102 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE { | 102 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE { |
| 103 window_state_->RemoveObserver(this); | 103 window_state_->RemoveObserver(this); |
| 104 window_state_->window()->RemoveObserver(this); | 104 window_state_->window()->RemoveObserver(this); |
| 105 window_state_ = NULL; | 105 window_state_ = NULL; |
| 106 } | 106 } |
| 107 // Overridden from ash::wm::WindowStateObserver: | 107 // Overridden from ash::wm::WindowStateObserver: |
| 108 virtual void OnWindowShowTypeChanged( | 108 virtual void OnPostWindowShowTypeChange( |
| 109 ash::wm::WindowState* window_state, | 109 ash::wm::WindowState* window_state, |
| 110 ash::wm::WindowShowType old_type) OVERRIDE { | 110 ash::wm::WindowShowType old_type) OVERRIDE { |
| 111 if (!window_state->IsFullscreen() && | 111 if (!window_state->IsFullscreen() && |
| 112 !window_state->IsMinimized() && | 112 !window_state->IsMinimized() && |
| 113 immersive_fullscreen_controller_.get() && | 113 immersive_fullscreen_controller_.get() && |
| 114 immersive_fullscreen_controller_->IsEnabled()) { | 114 immersive_fullscreen_controller_->IsEnabled()) { |
| 115 immersive_fullscreen_controller_->SetEnabled( | 115 immersive_fullscreen_controller_->SetEnabled( |
| 116 ash::ImmersiveFullscreenController::WINDOW_TYPE_OTHER, | 116 ash::ImmersiveFullscreenController::WINDOW_TYPE_OTHER, |
| 117 false); | 117 false); |
| 118 } | 118 } |
| (...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 490 } | 490 } |
| 491 | 491 |
| 492 //////////////////////////////////////////////////////////////////////////////// | 492 //////////////////////////////////////////////////////////////////////////////// |
| 493 // CustomFrameViewAsh, private: | 493 // CustomFrameViewAsh, private: |
| 494 | 494 |
| 495 int CustomFrameViewAsh::NonClientTopBorderHeight() const { | 495 int CustomFrameViewAsh::NonClientTopBorderHeight() const { |
| 496 return frame_->IsFullscreen() ? 0 : header_view_->GetPreferredHeight(); | 496 return frame_->IsFullscreen() ? 0 : header_view_->GetPreferredHeight(); |
| 497 } | 497 } |
| 498 | 498 |
| 499 } // namespace ash | 499 } // namespace ash |
| OLD | NEW |