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

Side by Side Diff: athena/wm/window_manager_impl.cc

Issue 558483003: Rename athena/common to athena/util (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: revert unnecessary change Created 6 years, 3 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 | « athena/wm/DEPS ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "athena/wm/window_manager_impl.h" 5 #include "athena/wm/window_manager_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "athena/common/container_priorities.h"
10 #include "athena/screen/public/screen_manager.h" 9 #include "athena/screen/public/screen_manager.h"
10 #include "athena/util/container_priorities.h"
11 #include "athena/wm/bezel_controller.h" 11 #include "athena/wm/bezel_controller.h"
12 #include "athena/wm/public/window_manager_observer.h" 12 #include "athena/wm/public/window_manager_observer.h"
13 #include "athena/wm/split_view_controller.h" 13 #include "athena/wm/split_view_controller.h"
14 #include "athena/wm/title_drag_controller.h" 14 #include "athena/wm/title_drag_controller.h"
15 #include "athena/wm/window_list_provider_impl.h" 15 #include "athena/wm/window_list_provider_impl.h"
16 #include "athena/wm/window_overview_mode.h" 16 #include "athena/wm/window_overview_mode.h"
17 #include "base/bind.h" 17 #include "base/bind.h"
18 #include "base/logging.h" 18 #include "base/logging.h"
19 #include "ui/aura/layout_manager.h" 19 #include "ui/aura/layout_manager.h"
20 #include "ui/aura/window.h" 20 #include "ui/aura/window.h"
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 DCHECK(!instance); 401 DCHECK(!instance);
402 } 402 }
403 403
404 // static 404 // static
405 WindowManager* WindowManager::GetInstance() { 405 WindowManager* WindowManager::GetInstance() {
406 DCHECK(instance); 406 DCHECK(instance);
407 return instance; 407 return instance;
408 } 408 }
409 409
410 } // namespace athena 410 } // namespace athena
OLDNEW
« no previous file with comments | « athena/wm/DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698