OLD | NEW |
---|---|
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. | |
6 // See base/logging for details on this. | |
7 #define NOTIMPLEMENTED_POLICY 5 | |
James Cook
2016/08/24 23:15:37
Could this live in the build file? Or do you only
sky
2016/08/24 23:25:55
Yes, if I add to build file it impacts all of view
| |
8 | |
5 #include "ui/views/mus/screen_mus.h" | 9 #include "ui/views/mus/screen_mus.h" |
6 | 10 |
7 #include "services/shell/public/cpp/connection.h" | 11 #include "services/shell/public/cpp/connection.h" |
8 #include "services/shell/public/cpp/connector.h" | 12 #include "services/shell/public/cpp/connector.h" |
9 #include "ui/aura/window.h" | 13 #include "ui/aura/window.h" |
10 #include "ui/display/display_finder.h" | 14 #include "ui/display/display_finder.h" |
11 #include "ui/display/display_observer.h" | 15 #include "ui/display/display_observer.h" |
12 #include "ui/views/mus/screen_mus_delegate.h" | 16 #include "ui/views/mus/screen_mus_delegate.h" |
13 #include "ui/views/mus/window_manager_frame_values.h" | 17 #include "ui/views/mus/window_manager_frame_values.h" |
14 | 18 |
15 #ifdef NOTIMPLEMENTED | |
16 #undef NOTIMPLEMENTED | |
17 #define NOTIMPLEMENTED() DVLOG(1) << "notimplemented" | |
18 #endif | |
19 | |
20 namespace mojo { | 19 namespace mojo { |
21 | 20 |
22 template <> | 21 template <> |
23 struct TypeConverter<views::WindowManagerFrameValues, | 22 struct TypeConverter<views::WindowManagerFrameValues, |
24 ui::mojom::FrameDecorationValuesPtr> { | 23 ui::mojom::FrameDecorationValuesPtr> { |
25 static views::WindowManagerFrameValues Convert( | 24 static views::WindowManagerFrameValues Convert( |
26 const ui::mojom::FrameDecorationValuesPtr& input) { | 25 const ui::mojom::FrameDecorationValuesPtr& input) { |
27 views::WindowManagerFrameValues result; | 26 views::WindowManagerFrameValues result; |
28 result.normal_insets = input->normal_client_area_insets; | 27 result.normal_insets = input->normal_client_area_insets; |
29 result.maximized_insets = input->maximized_client_area_insets; | 28 result.maximized_insets = input->maximized_client_area_insets; |
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
183 delegate_->OnWindowManagerFrameValuesChanged(); | 182 delegate_->OnWindowManagerFrameValuesChanged(); |
184 } | 183 } |
185 } | 184 } |
186 } | 185 } |
187 | 186 |
188 void ScreenMus::OnDisplayRemoved(int64_t id) { | 187 void ScreenMus::OnDisplayRemoved(int64_t id) { |
189 display_list_.RemoveDisplay(id); | 188 display_list_.RemoveDisplay(id); |
190 } | 189 } |
191 | 190 |
192 } // namespace views | 191 } // namespace views |
OLD | NEW |