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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/root_window_settings.h ('k') | ash/scoped_target_root_window.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/root_window_settings.cc
diff --git a/ash/root_window_settings.cc b/ash/root_window_settings.cc
index 06198ca1562fb03573e0762f4498211d3b7b5306..33880ed0be9521ba8be46d49d6e5635ef6557d61 100644
--- a/ash/root_window_settings.cc
+++ b/ash/root_window_settings.cc
@@ -22,17 +22,17 @@ RootWindowSettings::RootWindowSettings()
controller(NULL) {
}
-RootWindowSettings* InitRootWindowSettings(aura::RootWindow* root) {
+RootWindowSettings* InitRootWindowSettings(aura::Window* root) {
RootWindowSettings* settings = new RootWindowSettings();
root->SetProperty(kRootWindowSettingsKey, settings);
return settings;
}
-RootWindowSettings* GetRootWindowSettings(aura::RootWindow* root) {
+RootWindowSettings* GetRootWindowSettings(aura::Window* root) {
return root->GetProperty(kRootWindowSettingsKey);
}
-const RootWindowSettings* GetRootWindowSettings(const aura::RootWindow* root) {
+const RootWindowSettings* GetRootWindowSettings(const aura::Window* root) {
return root->GetProperty(kRootWindowSettingsKey);
}
« 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