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

Side by Side Diff: ash/root_window_settings.cc

Issue 294073006: Remove dispatcher when shutting down RootWindowController (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « ash/root_window_settings.h ('k') | ash/wm/coordinate_conversion.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "ash/root_window_settings.h" 5 #include "ash/root_window_settings.h"
6 6
7 #include "ui/aura/window_event_dispatcher.h" 7 #include "ui/aura/window_event_dispatcher.h"
8 #include "ui/aura/window_property.h" 8 #include "ui/aura/window_property.h"
9 #include "ui/gfx/display.h" 9 #include "ui/gfx/display.h"
10 10
11 DECLARE_WINDOW_PROPERTY_TYPE(ash::RootWindowSettings*); 11 DECLARE_WINDOW_PROPERTY_TYPE(ash::RootWindowSettings*);
12 12
13 namespace ash { 13 namespace ash {
14 14
15 DEFINE_OWNED_WINDOW_PROPERTY_KEY(RootWindowSettings, 15 DEFINE_OWNED_WINDOW_PROPERTY_KEY(RootWindowSettings,
16 kRootWindowSettingsKey, NULL); 16 kRootWindowSettingsKey, NULL);
17 17
18 RootWindowSettings::RootWindowSettings() 18 RootWindowSettings::RootWindowSettings()
19 : display_id(gfx::Display::kInvalidDisplayID), 19 : display_id(gfx::Display::kInvalidDisplayID),
20 controller(NULL), 20 controller(NULL) {
21 shutdown(false) {
22 } 21 }
23 22
24 RootWindowSettings* InitRootWindowSettings(aura::Window* root) { 23 RootWindowSettings* InitRootWindowSettings(aura::Window* root) {
25 RootWindowSettings* settings = new RootWindowSettings(); 24 RootWindowSettings* settings = new RootWindowSettings();
26 root->SetProperty(kRootWindowSettingsKey, settings); 25 root->SetProperty(kRootWindowSettingsKey, settings);
27 return settings; 26 return settings;
28 } 27 }
29 28
30 RootWindowSettings* GetRootWindowSettings(aura::Window* root) { 29 RootWindowSettings* GetRootWindowSettings(aura::Window* root) {
31 return root->GetProperty(kRootWindowSettingsKey); 30 return root->GetProperty(kRootWindowSettingsKey);
32 } 31 }
33 32
34 const RootWindowSettings* GetRootWindowSettings(const aura::Window* root) { 33 const RootWindowSettings* GetRootWindowSettings(const aura::Window* root) {
35 return root->GetProperty(kRootWindowSettingsKey); 34 return root->GetProperty(kRootWindowSettingsKey);
36 } 35 }
37 36
38 } // namespace ash 37 } // namespace ash
OLDNEW
« no previous file with comments | « ash/root_window_settings.h ('k') | ash/wm/coordinate_conversion.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698