Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(23)

Side by Side Diff: ash/mus/non_client_frame_controller.cc

Issue 2391023002: Two small ash fixes. (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/mus/non_client_frame_controller.h" 5 #include "ash/mus/non_client_frame_controller.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <memory> 9 #include <memory>
10 #include <string> 10 #include <string>
(...skipping 10 matching lines...) Expand all
21 #include "ash/mus/shadow.h" 21 #include "ash/mus/shadow.h"
22 #include "ash/shared/immersive_fullscreen_controller_delegate.h" 22 #include "ash/shared/immersive_fullscreen_controller_delegate.h"
23 #include "base/macros.h" 23 #include "base/macros.h"
24 #include "base/strings/utf_string_conversions.h" 24 #include "base/strings/utf_string_conversions.h"
25 #include "services/ui/public/cpp/property_type_converters.h" 25 #include "services/ui/public/cpp/property_type_converters.h"
26 #include "services/ui/public/cpp/window.h" 26 #include "services/ui/public/cpp/window.h"
27 #include "services/ui/public/cpp/window_manager_delegate.h" 27 #include "services/ui/public/cpp/window_manager_delegate.h"
28 #include "services/ui/public/cpp/window_property.h" 28 #include "services/ui/public/cpp/window_property.h"
29 #include "services/ui/public/cpp/window_tree_client.h" 29 #include "services/ui/public/cpp/window_tree_client.h"
30 #include "services/ui/public/interfaces/window_manager.mojom.h" 30 #include "services/ui/public/interfaces/window_manager.mojom.h"
31 #include "services/ui/public/interfaces/window_tree_host.mojom.h"
32 #include "ui/aura/layout_manager.h" 31 #include "ui/aura/layout_manager.h"
33 #include "ui/aura/window.h" 32 #include "ui/aura/window.h"
34 #include "ui/aura/window_tree_host.h" 33 #include "ui/aura/window_tree_host.h"
35 #include "ui/base/hit_test.h" 34 #include "ui/base/hit_test.h"
36 #include "ui/compositor/layer.h" 35 #include "ui/compositor/layer.h"
37 #include "ui/gfx/geometry/vector2d.h" 36 #include "ui/gfx/geometry/vector2d.h"
38 #include "ui/views/mus/native_widget_mus.h" 37 #include "ui/views/mus/native_widget_mus.h"
39 #include "ui/views/widget/widget.h" 38 #include "ui/views/widget/widget.h"
40 39
41 namespace ash { 40 namespace ash {
(...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after
459 } 458 }
460 } 459 }
461 460
462 void NonClientFrameController::OnWindowDestroyed(ui::Window* window) { 461 void NonClientFrameController::OnWindowDestroyed(ui::Window* window) {
463 window_->RemoveObserver(this); 462 window_->RemoveObserver(this);
464 window_ = nullptr; 463 window_ = nullptr;
465 } 464 }
466 465
467 } // namespace mus 466 } // namespace mus
468 } // namespace ash 467 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/accelerators/accelerator_controller_delegate_mus.cc ('k') | ash/mus/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698