summaryrefslogtreecommitdiffstats
path: root/ash/display/window_tree_host_manager.cc
diff options
context:
space:
mode:
authorrobliao <robliao@chromium.org>2016-03-22 17:42:34 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-23 00:43:35 +0000
commitdf372032b408542d782c18cfc057ed729e46665a (patch)
treec79f8438f9f5e833ba245aa7e26f1e4341df7016 /ash/display/window_tree_host_manager.cc
parentd6541e3442ef1da8fe2490f0ac315047d5d8d336 (diff)
downloadchromium_src-df372032b408542d782c18cfc057ed729e46665a.zip
chromium_src-df372032b408542d782c18cfc057ed729e46665a.tar.gz
chromium_src-df372032b408542d782c18cfc057ed729e46665a.tar.bz2
Convert ScopedVector<DisplayPlacement> to std::vector<DisplayPlacement>
Now that JSONValueConverter isn't used any more, we can use std::vector. BUG=595498 Review URL: https://codereview.chromium.org/1819533002 Cr-Commit-Position: refs/heads/master@{#382748}
Diffstat (limited to 'ash/display/window_tree_host_manager.cc')
-rw-r--r--ash/display/window_tree_host_manager.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/display/window_tree_host_manager.cc b/ash/display/window_tree_host_manager.cc
index 13e143b..b24022e 100644
--- a/ash/display/window_tree_host_manager.cc
+++ b/ash/display/window_tree_host_manager.cc
@@ -445,7 +445,7 @@ void WindowTreeHostManager::SetPrimaryDisplayId(int64_t id) {
// Only update the layout if it is requested to swap primary display.
if (layout.primary_id != new_primary_display.id()) {
scoped_ptr<DisplayLayout> swapped_layout(layout.Copy());
- swapped_layout->placement_list[0]->Swap();
+ swapped_layout->placement_list[0].Swap();
swapped_layout->primary_id = new_primary_display.id();
DisplayIdList list = display_manager->GetCurrentDisplayIdList();
GetDisplayManager()->layout_store()->RegisterLayoutForDisplayIdList(