OLD | NEW |
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 "mash/wm/frame/non_client_frame_view_mash.h" | 5 #include "mash/wm/frame/non_client_frame_view_mash.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <memory> | 8 #include <memory> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
11 #include "base/macros.h" | 11 #include "base/macros.h" |
12 #include "components/mus/public/cpp/window.h" | 12 #include "components/mus/public/cpp/window.h" |
13 #include "components/mus/public/cpp/window_tree_connection.h" | 13 #include "components/mus/public/cpp/window_tree_connection.h" |
14 #include "grit/mash_wm_resources.h" | 14 #include "grit/mash_wm_resources.h" |
15 #include "mash/wm/frame/caption_buttons/frame_caption_button_container_view.h" | 15 #include "mash/wm/frame/caption_buttons/frame_caption_button_container_view.h" |
16 #include "mash/wm/frame/default_header_painter.h" | 16 #include "mash/wm/frame/default_header_painter.h" |
17 #include "mash/wm/frame/frame_border_hit_test_controller.h" | 17 #include "mash/wm/frame/frame_border_hit_test_controller.h" |
18 #include "mash/wm/frame/header_painter.h" | 18 #include "mash/wm/frame/header_painter.h" |
19 #include "mojo/converters/input_events/input_events_type_converters.h" | |
20 #include "ui/base/resource/resource_bundle.h" | 19 #include "ui/base/resource/resource_bundle.h" |
21 #include "ui/compositor/paint_recorder.h" | 20 #include "ui/compositor/paint_recorder.h" |
| 21 #include "ui/events/mojo/input_events_type_converters.h" |
22 #include "ui/gfx/canvas.h" | 22 #include "ui/gfx/canvas.h" |
23 #include "ui/gfx/geometry/rect.h" | 23 #include "ui/gfx/geometry/rect.h" |
24 #include "ui/gfx/geometry/rect_conversions.h" | 24 #include "ui/gfx/geometry/rect_conversions.h" |
25 #include "ui/gfx/geometry/size.h" | 25 #include "ui/gfx/geometry/size.h" |
26 #include "ui/gfx/image/image.h" | 26 #include "ui/gfx/image/image.h" |
27 #include "ui/views/view.h" | 27 #include "ui/views/view.h" |
28 #include "ui/views/widget/widget.h" | 28 #include "ui/views/widget/widget.h" |
29 #include "ui/views/widget/widget_delegate.h" | 29 #include "ui/views/widget/widget_delegate.h" |
30 | 30 |
31 namespace mash { | 31 namespace mash { |
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
360 void NonClientFrameViewMash::OnWindowTreeFocusChanged(mus::Window* gained_focus, | 360 void NonClientFrameViewMash::OnWindowTreeFocusChanged(mus::Window* gained_focus, |
361 mus::Window* lost_focus) { | 361 mus::Window* lost_focus) { |
362 const bool had_focus = lost_focus && window_->Contains(lost_focus); | 362 const bool had_focus = lost_focus && window_->Contains(lost_focus); |
363 const bool has_focus = gained_focus && window_->Contains(gained_focus); | 363 const bool has_focus = gained_focus && window_->Contains(gained_focus); |
364 if (had_focus != has_focus) | 364 if (had_focus != has_focus) |
365 SchedulePaint(); | 365 SchedulePaint(); |
366 } | 366 } |
367 | 367 |
368 } // namespace wm | 368 } // namespace wm |
369 } // namespace mash | 369 } // namespace mash |
OLD | NEW |