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

Side by Side Diff: ash/mus/frame/non_client_frame_view_mash.cc

Issue 2119963002: Move mus to //services/ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 5 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
« no previous file with comments | « ash/mus/frame/non_client_frame_view_mash.h ('k') | ash/mus/layout_manager.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/frame/non_client_frame_view_mash.h" 5 #include "ash/mus/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 "ash/mus/frame/caption_buttons/frame_caption_button_container_view.h" 11 #include "ash/mus/frame/caption_buttons/frame_caption_button_container_view.h"
12 #include "ash/mus/frame/default_header_painter.h" 12 #include "ash/mus/frame/default_header_painter.h"
13 #include "ash/mus/frame/frame_border_hit_test_controller.h" 13 #include "ash/mus/frame/frame_border_hit_test_controller.h"
14 #include "ash/mus/frame/header_painter.h" 14 #include "ash/mus/frame/header_painter.h"
15 #include "base/macros.h" 15 #include "base/macros.h"
16 #include "components/mus/public/cpp/window.h"
17 #include "components/mus/public/cpp/window_tree_client.h"
18 #include "grit/ash_mus_resources.h" 16 #include "grit/ash_mus_resources.h"
17 #include "services/ui/public/cpp/window.h"
18 #include "services/ui/public/cpp/window_tree_client.h"
19 #include "ui/base/resource/resource_bundle.h" 19 #include "ui/base/resource/resource_bundle.h"
20 #include "ui/compositor/paint_recorder.h" 20 #include "ui/compositor/paint_recorder.h"
21 #include "ui/gfx/canvas.h" 21 #include "ui/gfx/canvas.h"
22 #include "ui/gfx/geometry/rect.h" 22 #include "ui/gfx/geometry/rect.h"
23 #include "ui/gfx/geometry/rect_conversions.h" 23 #include "ui/gfx/geometry/rect_conversions.h"
24 #include "ui/gfx/geometry/size.h" 24 #include "ui/gfx/geometry/size.h"
25 #include "ui/gfx/image/image.h" 25 #include "ui/gfx/image/image.h"
26 #include "ui/views/view.h" 26 #include "ui/views/view.h"
27 #include "ui/views/widget/widget.h" 27 #include "ui/views/widget/widget.h"
28 #include "ui/views/widget/widget_delegate.h" 28 #include "ui/views/widget/widget_delegate.h"
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 ::mus::Window* gained_focus, 361 ::mus::Window* gained_focus,
362 ::mus::Window* lost_focus) { 362 ::mus::Window* lost_focus) {
363 const bool had_focus = lost_focus && window_->Contains(lost_focus); 363 const bool had_focus = lost_focus && window_->Contains(lost_focus);
364 const bool has_focus = gained_focus && window_->Contains(gained_focus); 364 const bool has_focus = gained_focus && window_->Contains(gained_focus);
365 if (had_focus != has_focus) 365 if (had_focus != has_focus)
366 SchedulePaint(); 366 SchedulePaint();
367 } 367 }
368 368
369 } // namespace mus 369 } // namespace mus
370 } // namespace ash 370 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/frame/non_client_frame_view_mash.h ('k') | ash/mus/layout_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698