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

Side by Side Diff: components/exo/display.cc

Issue 2025413002: Moves RootWindowControllerCommon and LayoutManager to common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@use_root_window_controller_common
Patch Set: merge Created 4 years, 6 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 | « chrome/browser/ui/webui/chromeos/login/oobe_ui.cc ('k') | components/exo/display_unittest.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 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 "components/exo/display.h" 5 #include "components/exo/display.h"
6 6
7 #include <iterator> 7 #include <iterator>
8 #include <utility> 8 #include <utility>
9 9
10 #include "ash/common/wm/wm_shell_window_ids.h" 10 #include "ash/common/shell_window_ids.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/memory/ptr_util.h" 12 #include "base/memory/ptr_util.h"
13 #include "base/trace_event/trace_event.h" 13 #include "base/trace_event/trace_event.h"
14 #include "base/trace_event/trace_event_argument.h" 14 #include "base/trace_event/trace_event_argument.h"
15 #include "components/exo/shared_memory.h" 15 #include "components/exo/shared_memory.h"
16 #include "components/exo/shell_surface.h" 16 #include "components/exo/shell_surface.h"
17 #include "components/exo/sub_surface.h" 17 #include "components/exo/sub_surface.h"
18 #include "components/exo/surface.h" 18 #include "components/exo/surface.h"
19 #include "ui/views/widget/widget.h" 19 #include "ui/views/widget/widget.h"
20 20
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 165
166 if (surface->HasSurfaceDelegate()) { 166 if (surface->HasSurfaceDelegate()) {
167 DLOG(ERROR) << "Surface has already been assigned a role"; 167 DLOG(ERROR) << "Surface has already been assigned a role";
168 return nullptr; 168 return nullptr;
169 } 169 }
170 170
171 return base::WrapUnique(new SubSurface(surface, parent)); 171 return base::WrapUnique(new SubSurface(surface, parent));
172 } 172 }
173 173
174 } // namespace exo 174 } // namespace exo
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/oobe_ui.cc ('k') | components/exo/display_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698