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

Side by Side Diff: ash/root_window_settings.cc

Issue 37733003: Make GetRootWindow() return a Window instead of a RootWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 2 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/scoped_target_root_window.h » ('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/root_window.h" 7 #include "ui/aura/root_window.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::internal::RootWindowSettings*); 11 DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::RootWindowSettings*);
12 12
13 namespace ash { 13 namespace ash {
14 namespace internal { 14 namespace internal {
15 15
16 DEFINE_OWNED_WINDOW_PROPERTY_KEY(RootWindowSettings, 16 DEFINE_OWNED_WINDOW_PROPERTY_KEY(RootWindowSettings,
17 kRootWindowSettingsKey, NULL); 17 kRootWindowSettingsKey, NULL);
18 18
19 RootWindowSettings::RootWindowSettings() 19 RootWindowSettings::RootWindowSettings()
20 : solo_window_header(false), 20 : solo_window_header(false),
21 display_id(gfx::Display::kInvalidDisplayID), 21 display_id(gfx::Display::kInvalidDisplayID),
22 controller(NULL) { 22 controller(NULL) {
23 } 23 }
24 24
25 RootWindowSettings* InitRootWindowSettings(aura::RootWindow* root) { 25 RootWindowSettings* InitRootWindowSettings(aura::Window* root) {
26 RootWindowSettings* settings = new RootWindowSettings(); 26 RootWindowSettings* settings = new RootWindowSettings();
27 root->SetProperty(kRootWindowSettingsKey, settings); 27 root->SetProperty(kRootWindowSettingsKey, settings);
28 return settings; 28 return settings;
29 } 29 }
30 30
31 RootWindowSettings* GetRootWindowSettings(aura::RootWindow* root) { 31 RootWindowSettings* GetRootWindowSettings(aura::Window* root) {
32 return root->GetProperty(kRootWindowSettingsKey); 32 return root->GetProperty(kRootWindowSettingsKey);
33 } 33 }
34 34
35 const RootWindowSettings* GetRootWindowSettings(const aura::RootWindow* root) { 35 const RootWindowSettings* GetRootWindowSettings(const aura::Window* root) {
36 return root->GetProperty(kRootWindowSettingsKey); 36 return root->GetProperty(kRootWindowSettingsKey);
37 } 37 }
38 38
39 } // namespace internal 39 } // namespace internal
40 } // namespace ash 40 } // namespace ash
OLDNEW
« no previous file with comments | « ash/root_window_settings.h ('k') | ash/scoped_target_root_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698