| Index: ash/root_window_settings.cc
|
| diff --git a/ash/root_window_settings.cc b/ash/root_window_settings.cc
|
| index 9f51bd9e9bd0f60f8b688f85b57eb60ac70114ef..555c4c8baa8d2d5c6054bae4677c249acb30416f 100644
|
| --- a/ash/root_window_settings.cc
|
| +++ b/ash/root_window_settings.cc
|
| @@ -8,10 +8,9 @@
|
| #include "ui/aura/window_property.h"
|
| #include "ui/gfx/display.h"
|
|
|
| -DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::RootWindowSettings*);
|
| +DECLARE_WINDOW_PROPERTY_TYPE(ash::RootWindowSettings*);
|
|
|
| namespace ash {
|
| -namespace internal {
|
|
|
| DEFINE_OWNED_WINDOW_PROPERTY_KEY(RootWindowSettings,
|
| kRootWindowSettingsKey, NULL);
|
| @@ -36,5 +35,4 @@ const RootWindowSettings* GetRootWindowSettings(const aura::Window* root) {
|
| return root->GetProperty(kRootWindowSettingsKey);
|
| }
|
|
|
| -} // namespace internal
|
| } // namespace ash
|
|
|