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

Side by Side Diff: ui/views/mus/native_widget_mus.cc

Issue 2233003003: services/ui: Inject GpuService instance where needed, instead of singleton. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 4 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 | « services/ui/public/cpp/output_surface.cc ('k') | ui/views/mus/surface_context_factory.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 "ui/views/mus/native_widget_mus.h" 5 #include "ui/views/mus/native_widget_mus.h"
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
11 #include "base/threading/thread_task_runner_handle.h" 11 #include "base/threading/thread_task_runner_handle.h"
12 #include "services/ui/common/gpu_service.h"
13 #include "services/ui/public/cpp/property_type_converters.h" 12 #include "services/ui/public/cpp/property_type_converters.h"
14 #include "services/ui/public/cpp/window.h" 13 #include "services/ui/public/cpp/window.h"
15 #include "services/ui/public/cpp/window_observer.h" 14 #include "services/ui/public/cpp/window_observer.h"
16 #include "services/ui/public/cpp/window_property.h" 15 #include "services/ui/public/cpp/window_property.h"
17 #include "services/ui/public/cpp/window_tree_client.h" 16 #include "services/ui/public/cpp/window_tree_client.h"
18 #include "services/ui/public/interfaces/cursor.mojom.h" 17 #include "services/ui/public/interfaces/cursor.mojom.h"
19 #include "services/ui/public/interfaces/window_manager.mojom.h" 18 #include "services/ui/public/interfaces/window_manager.mojom.h"
20 #include "services/ui/public/interfaces/window_manager_constants.mojom.h" 19 #include "services/ui/public/interfaces/window_manager_constants.mojom.h"
21 #include "services/ui/public/interfaces/window_tree.mojom.h" 20 #include "services/ui/public/interfaces/window_tree.mojom.h"
22 #include "ui/aura/client/default_capture_client.h" 21 #include "ui/aura/client/default_capture_client.h"
(...skipping 1401 matching lines...) Expand 10 before | Expand all | Expand 10 after
1424 1423
1425 gfx::Path mask_path; 1424 gfx::Path mask_path;
1426 native_widget_delegate_->GetHitTestMask(&mask_path); 1425 native_widget_delegate_->GetHitTestMask(&mask_path);
1427 // TODO(jamescook): Use the full path for the mask. 1426 // TODO(jamescook): Use the full path for the mask.
1428 gfx::Rect mask_rect = 1427 gfx::Rect mask_rect =
1429 gfx::ToEnclosingRect(gfx::SkRectToRectF(mask_path.getBounds())); 1428 gfx::ToEnclosingRect(gfx::SkRectToRectF(mask_path.getBounds()));
1430 window_->SetHitTestMask(mask_rect); 1429 window_->SetHitTestMask(mask_rect);
1431 } 1430 }
1432 1431
1433 } // namespace views 1432 } // namespace views
OLDNEW
« no previous file with comments | « services/ui/public/cpp/output_surface.cc ('k') | ui/views/mus/surface_context_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698