OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/apps/chrome_native_app_window_views_aura_ash.h
" | 5 #include "chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.h
" |
6 | 6 |
7 #include "apps/ui/views/app_window_frame_view.h" | 7 #include "apps/ui/views/app_window_frame_view.h" |
8 #include "ash/ash_constants.h" | 8 #include "ash/common/ash_constants.h" |
9 #include "ash/ash_switches.h" | 9 #include "ash/common/ash_switches.h" |
| 10 #include "ash/common/wm_window.h" |
10 #include "ash/frame/custom_frame_view_ash.h" | 11 #include "ash/frame/custom_frame_view_ash.h" |
11 #include "ash/public/cpp/shell_window_ids.h" | 12 #include "ash/public/cpp/shell_window_ids.h" |
12 #include "ash/public/cpp/window_properties.h" | 13 #include "ash/public/cpp/window_properties.h" |
13 #include "ash/shared/app_types.h" | 14 #include "ash/shared/app_types.h" |
14 #include "ash/shared/immersive_fullscreen_controller.h" | 15 #include "ash/shared/immersive_fullscreen_controller.h" |
15 #include "ash/shelf/shelf_item_types.h" | 16 #include "ash/shelf/shelf_item_types.h" |
16 #include "ash/shell.h" | 17 #include "ash/shell.h" |
17 #include "ash/wm/panels/panel_frame_view.h" | 18 #include "ash/wm/panels/panel_frame_view.h" |
18 #include "ash/wm/window_properties.h" | 19 #include "ash/wm/window_properties.h" |
19 #include "ash/wm/window_state.h" | 20 #include "ash/wm/window_state.h" |
20 #include "ash/wm/window_state_aura.h" | 21 #include "ash/wm/window_state_aura.h" |
21 #include "ash/wm/window_state_delegate.h" | 22 #include "ash/wm/window_state_delegate.h" |
22 #include "ash/wm/window_state_observer.h" | 23 #include "ash/wm/window_state_observer.h" |
23 #include "ash/wm_window.h" | |
24 #include "chrome/browser/chromeos/note_taking_helper.h" | 24 #include "chrome/browser/chromeos/note_taking_helper.h" |
25 #include "chrome/browser/profiles/profile.h" | 25 #include "chrome/browser/profiles/profile.h" |
26 #include "chrome/browser/ui/ash/ash_util.h" | 26 #include "chrome/browser/ui/ash/ash_util.h" |
27 #include "chrome/browser/ui/ash/multi_user/multi_user_context_menu.h" | 27 #include "chrome/browser/ui/ash/multi_user/multi_user_context_menu.h" |
28 #include "services/service_manager/runner/common/client_util.h" | 28 #include "services/service_manager/runner/common/client_util.h" |
29 #include "services/ui/public/cpp/property_type_converters.h" | 29 #include "services/ui/public/cpp/property_type_converters.h" |
30 #include "services/ui/public/interfaces/window_manager.mojom.h" | 30 #include "services/ui/public/interfaces/window_manager.mojom.h" |
31 #include "ui/aura/client/aura_constants.h" | 31 #include "ui/aura/client/aura_constants.h" |
32 #include "ui/aura/mus/property_converter.h" | 32 #include "ui/aura/mus/property_converter.h" |
33 #include "ui/aura/mus/window_tree_host_mus.h" | 33 #include "ui/aura/mus/window_tree_host_mus.h" |
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
394 window_tree_host->SetClientArea(insets, | 394 window_tree_host->SetClientArea(insets, |
395 std::move(additional_client_regions)); | 395 std::move(additional_client_regions)); |
396 } | 396 } |
397 } | 397 } |
398 | 398 |
399 void ChromeNativeAppWindowViewsAuraAsh::OnMenuClosed() { | 399 void ChromeNativeAppWindowViewsAuraAsh::OnMenuClosed() { |
400 menu_runner_.reset(); | 400 menu_runner_.reset(); |
401 menu_model_adapter_.reset(); | 401 menu_model_adapter_.reset(); |
402 menu_model_.reset(); | 402 menu_model_.reset(); |
403 } | 403 } |
OLD | NEW |