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

Side by Side Diff: athena/screen/screen_manager_impl.cc

Issue 801953002: Use template specialization to generate WindowProperty code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use namespace Created 6 years 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/screen/modal_window_controller.cc ('k') | athena/util/fill_layout_manager.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 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/screen/screen_manager_impl.h" 5 #include "athena/screen/screen_manager_impl.h"
6 6
7 #include "athena/input/public/accelerator_manager.h" 7 #include "athena/input/public/accelerator_manager.h"
8 #include "athena/screen/modal_window_controller.h" 8 #include "athena/screen/modal_window_controller.h"
9 #include "athena/screen/screen_accelerator_handler.h" 9 #include "athena/screen/screen_accelerator_handler.h"
10 #include "athena/util/container_priorities.h" 10 #include "athena/util/container_priorities.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "ui/aura/client/aura_constants.h" 13 #include "ui/aura/client/aura_constants.h"
14 #include "ui/aura/client/screen_position_client.h" 14 #include "ui/aura/client/screen_position_client.h"
15 #include "ui/aura/test/test_screen.h" 15 #include "ui/aura/test/test_screen.h"
16 #include "ui/aura/window.h" 16 #include "ui/aura/window.h"
17 #include "ui/aura/window_property.h" 17 #include "ui/aura/window_property.h"
18 #include "ui/aura/window_targeter.h" 18 #include "ui/aura/window_targeter.h"
19 #include "ui/aura/window_tree_host.h" 19 #include "ui/aura/window_tree_host.h"
20 #include "ui/gfx/display.h" 20 #include "ui/gfx/display.h"
21 #include "ui/gfx/screen.h" 21 #include "ui/gfx/screen.h"
22 #include "ui/wm/core/base_focus_rules.h" 22 #include "ui/wm/core/base_focus_rules.h"
23 #include "ui/wm/core/capture_controller.h" 23 #include "ui/wm/core/capture_controller.h"
24 #include "ui/wm/core/default_screen_position_client.h" 24 #include "ui/wm/core/default_screen_position_client.h"
25 #include "ui/wm/core/focus_controller.h" 25 #include "ui/wm/core/focus_controller.h"
26 #include "ui/wm/core/window_util.h" 26 #include "ui/wm/core/window_util.h"
27 27
28 // This is to avoid creating type definitoin for kAlwaysOnTopKey. 28 DECLARE_WINDOW_PROPERTY_TYPE(athena::ScreenManager::ContainerParams*);
29 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(ATHENA_EXPORT, bool);
30 29
31 namespace athena { 30 namespace athena {
32 namespace { 31 namespace {
33 32
34 DEFINE_OWNED_WINDOW_PROPERTY_KEY(ScreenManager::ContainerParams, 33 DEFINE_OWNED_WINDOW_PROPERTY_KEY(ScreenManager::ContainerParams,
35 kContainerParamsKey, 34 kContainerParamsKey,
36 nullptr); 35 nullptr);
37 36
38 ScreenManagerImpl* instance = nullptr; 37 ScreenManagerImpl* instance = nullptr;
39 38
(...skipping 372 matching lines...) Expand 10 before | Expand all | Expand 10 after
412 } 411 }
413 412
414 // static 413 // static
415 void ScreenManager::Shutdown() { 414 void ScreenManager::Shutdown() {
416 DCHECK(instance); 415 DCHECK(instance);
417 delete instance; 416 delete instance;
418 DCHECK(!instance); 417 DCHECK(!instance);
419 } 418 }
420 419
421 } // namespace athena 420 } // namespace athena
OLDNEW
« no previous file with comments | « athena/screen/modal_window_controller.cc ('k') | athena/util/fill_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698