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

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

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase 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
« no previous file with comments | « ui/views/mus/input_method_mus.h ('k') | ui/views/mus/views_mus_test_suite.cc » ('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 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 // This has to be before any other includes, else default is picked up. 5 // This has to be before any other includes, else default is picked up.
6 // See base/logging for details on this. 6 // See base/logging for details on this.
7 #define NOTIMPLEMENTED_POLICY 5 7 #define NOTIMPLEMENTED_POLICY 5
8 8
9 #include "ui/views/mus/screen_mus.h" 9 #include "ui/views/mus/screen_mus.h"
10 10
11 #include "services/shell/public/cpp/connection.h" 11 #include "services/service_manager/public/cpp/connection.h"
12 #include "services/shell/public/cpp/connector.h" 12 #include "services/service_manager/public/cpp/connector.h"
13 #include "ui/aura/window.h" 13 #include "ui/aura/window.h"
14 #include "ui/views/mus/native_widget_mus.h" 14 #include "ui/views/mus/native_widget_mus.h"
15 #include "ui/views/mus/screen_mus_delegate.h" 15 #include "ui/views/mus/screen_mus_delegate.h"
16 #include "ui/views/mus/window_manager_frame_values.h" 16 #include "ui/views/mus/window_manager_frame_values.h"
17 17
18 namespace mojo { 18 namespace mojo {
19 19
20 template <> 20 template <>
21 struct TypeConverter<views::WindowManagerFrameValues, 21 struct TypeConverter<views::WindowManagerFrameValues,
22 ui::mojom::FrameDecorationValuesPtr> { 22 ui::mojom::FrameDecorationValuesPtr> {
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 delegate_->OnWindowManagerFrameValuesChanged(); 130 delegate_->OnWindowManagerFrameValuesChanged();
131 } 131 }
132 } 132 }
133 } 133 }
134 134
135 void ScreenMus::OnDisplayRemoved(int64_t id) { 135 void ScreenMus::OnDisplayRemoved(int64_t id) {
136 display_list()->RemoveDisplay(id); 136 display_list()->RemoveDisplay(id);
137 } 137 }
138 138
139 } // namespace views 139 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/mus/input_method_mus.h ('k') | ui/views/mus/views_mus_test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698