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

Side by Side Diff: ui/ozone/common/display_snapshot_proxy.cc

Issue 2613493002: Fix namespace for src/ui/display/. (Closed)
Patch Set: Rebase. Created 3 years, 11 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "base/memory/ptr_util.h" 5 #include "base/memory/ptr_util.h"
6 6
7 #include "ui/ozone/common/display_snapshot_proxy.h" 7 #include "ui/ozone/common/display_snapshot_proxy.h"
8 8
9 #include <stddef.h> 9 #include <stddef.h>
10 10
11 #include "ui/ozone/common/display_mode_proxy.h" 11 #include "ui/ozone/common/display_mode_proxy.h"
12 #include "ui/ozone/common/gpu/ozone_gpu_message_params.h" 12 #include "ui/ozone/common/gpu/ozone_gpu_message_params.h"
13 13
14 namespace ui { 14 namespace ui {
15 15
16 namespace { 16 namespace {
17 17
18 bool SameModes(const DisplayMode_Params& lhs, const DisplayMode_Params& rhs) { 18 bool SameModes(const DisplayMode_Params& lhs, const DisplayMode_Params& rhs) {
19 return lhs.size == rhs.size && lhs.is_interlaced == rhs.is_interlaced && 19 return lhs.size == rhs.size && lhs.is_interlaced == rhs.is_interlaced &&
20 lhs.refresh_rate == rhs.refresh_rate; 20 lhs.refresh_rate == rhs.refresh_rate;
21 } 21 }
22 22
23 } // namespace 23 } // namespace
24 24
25 DisplaySnapshotProxy::DisplaySnapshotProxy(const DisplaySnapshot_Params& params) 25 DisplaySnapshotProxy::DisplaySnapshotProxy(const DisplaySnapshot_Params& params)
26 : DisplaySnapshot(params.display_id, 26 : DisplaySnapshot(
27 params.origin, 27 params.display_id,
28 params.physical_size, 28 params.origin,
29 params.type, 29 params.physical_size,
30 params.is_aspect_preserving_scaling, 30 params.type,
31 params.has_overscan, 31 params.is_aspect_preserving_scaling,
32 params.has_color_correction_matrix, 32 params.has_overscan,
33 params.display_name, 33 params.has_color_correction_matrix,
34 params.sys_path, 34 params.display_name,
35 std::vector<std::unique_ptr<const DisplayMode>>(), 35 params.sys_path,
36 params.edid, 36 std::vector<std::unique_ptr<const display::DisplayMode>>(),
37 NULL, 37 params.edid,
38 NULL), 38 NULL,
39 NULL),
39 string_representation_(params.string_representation) { 40 string_representation_(params.string_representation) {
40 for (size_t i = 0; i < params.modes.size(); ++i) { 41 for (size_t i = 0; i < params.modes.size(); ++i) {
41 modes_.push_back(base::MakeUnique<DisplayModeProxy>(params.modes[i])); 42 modes_.push_back(base::MakeUnique<DisplayModeProxy>(params.modes[i]));
42 43
43 if (params.has_current_mode && 44 if (params.has_current_mode &&
44 SameModes(params.modes[i], params.current_mode)) 45 SameModes(params.modes[i], params.current_mode))
45 current_mode_ = modes_.back().get(); 46 current_mode_ = modes_.back().get();
46 47
47 if (params.has_native_mode && 48 if (params.has_native_mode &&
48 SameModes(params.modes[i], params.native_mode)) 49 SameModes(params.modes[i], params.native_mode))
49 native_mode_ = modes_.back().get(); 50 native_mode_ = modes_.back().get();
50 } 51 }
51 52
52 product_id_ = params.product_id; 53 product_id_ = params.product_id;
53 maximum_cursor_size_ = params.maximum_cursor_size; 54 maximum_cursor_size_ = params.maximum_cursor_size;
54 } 55 }
55 56
56 DisplaySnapshotProxy::~DisplaySnapshotProxy() { 57 DisplaySnapshotProxy::~DisplaySnapshotProxy() {
57 } 58 }
58 59
59 std::string DisplaySnapshotProxy::ToString() const { 60 std::string DisplaySnapshotProxy::ToString() const {
60 return string_representation_; 61 return string_representation_;
61 } 62 }
62 63
63 } // namespace ui 64 } // namespace ui
OLDNEW
« no previous file with comments | « ui/ozone/common/display_snapshot_proxy.h ('k') | ui/ozone/common/gpu/ozone_gpu_message_params.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698