| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "chrome/browser/ui/views/frame/immersive_mode_controller_ash.h" | 5 #include "chrome/browser/ui/views/frame/immersive_mode_controller_ash.h" |
| 6 | 6 |
| 7 #include "ash/common/material_design/material_design_controller.h" | 7 #include "ash/common/material_design/material_design_controller.h" |
| 8 #include "ash/common/wm/window_state.h" | 8 #include "ash/common/wm/window_state.h" |
| 9 #include "ash/shared/immersive_revealed_lock.h" | 9 #include "ash/shared/immersive_revealed_lock.h" |
| 10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| 11 #include "ash/wm/window_state_aura.h" | 11 #include "ash/wm/window_state_aura.h" |
| 12 #include "base/macros.h" | 12 #include "base/macros.h" |
| 13 #include "base/memory/ptr_util.h" | 13 #include "base/memory/ptr_util.h" |
| 14 #include "chrome/browser/chrome_notification_types.h" | 14 #include "chrome/browser/chrome_notification_types.h" |
| 15 #include "chrome/browser/ui/ash/ash_util.h" | 15 #include "chrome/browser/ui/ash/ash_util.h" |
| 16 #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h" | 16 #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h" |
| 17 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" | 17 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" |
| 18 #include "chrome/browser/ui/views/frame/browser_view.h" | 18 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 19 #include "chrome/browser/ui/views/frame/top_container_view.h" | 19 #include "chrome/browser/ui/views/frame/top_container_view.h" |
| 20 #include "chrome/browser/ui/views/tabs/tab_strip.h" | 20 #include "chrome/browser/ui/views/tabs/tab_strip.h" |
| 21 #include "content/public/browser/notification_service.h" | 21 #include "content/public/browser/notification_service.h" |
| 22 #include "content/public/browser/web_contents.h" | 22 #include "content/public/browser/web_contents.h" |
| 23 #include "services/ui/public/cpp/property_type_converters.h" | 23 #include "services/ui/public/cpp/property_type_converters.h" |
| 24 #include "services/ui/public/interfaces/window_manager.mojom.h" | 24 #include "services/ui/public/interfaces/window_manager.mojom.h" |
| 25 #include "ui/aura/client/aura_constants.h" | 25 #include "ui/aura/client/aura_constants.h" |
| 26 #include "ui/aura/mus/mus_types.h" | 26 #include "ui/aura/mus/mus_types.h" |
| 27 #include "ui/aura/mus/mus_util.h" | |
| 28 #include "ui/aura/mus/property_converter.h" | 27 #include "ui/aura/mus/property_converter.h" |
| 29 #include "ui/aura/mus/window_port_mus.h" | 28 #include "ui/aura/mus/window_port_mus.h" |
| 30 #include "ui/aura/window.h" | 29 #include "ui/aura/window.h" |
| 31 #include "ui/compositor/layer.h" | 30 #include "ui/compositor/layer.h" |
| 32 #include "ui/compositor/paint_context.h" | 31 #include "ui/compositor/paint_context.h" |
| 33 #include "ui/compositor/paint_recorder.h" | 32 #include "ui/compositor/paint_recorder.h" |
| 34 #include "ui/views/background.h" | 33 #include "ui/views/background.h" |
| 35 #include "ui/views/mus/mus_client.h" | 34 #include "ui/views/mus/mus_client.h" |
| 36 #include "ui/views/view.h" | 35 #include "ui/views/view.h" |
| 37 #include "ui/views/widget/native_widget_aura.h" | 36 #include "ui/views/widget/native_widget_aura.h" |
| (...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 356 const void* key, | 355 const void* key, |
| 357 intptr_t old) { | 356 intptr_t old) { |
| 358 // In mash the window manager may move us out of immersive mode by changing | 357 // In mash the window manager may move us out of immersive mode by changing |
| 359 // the show state. When this happens notify the controller. | 358 // the show state. When this happens notify the controller. |
| 360 DCHECK(chrome::IsRunningInMash()); | 359 DCHECK(chrome::IsRunningInMash()); |
| 361 if (key == aura::client::kShowStateKey && | 360 if (key == aura::client::kShowStateKey && |
| 362 !browser_view_->GetWidget()->IsFullscreen()) { | 361 !browser_view_->GetWidget()->IsFullscreen()) { |
| 363 SetEnabled(false); | 362 SetEnabled(false); |
| 364 } | 363 } |
| 365 } | 364 } |
| OLD | NEW |