[Cleanup] fix macro, comments and unused includes

ash/root_window_settings.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_WM_ROOT_WINDOW_SETTINGS_H_
-#define ASH_WM_ROOT_WINDOW_SETTINGS_H_
+#ifndef ASH_ROOT_WINDOW_SETTINGS_H_
+#define ASH_ROOT_WINDOW_SETTINGS_H_
 
 #include "ash/ash_export.h"
 #include "base/basictypes.h"
 
 namespace aura {
 class RootWindow;
 }
 
 namespace ash {
 namespace internal {
@@ skipping 11 matching lines @@
   bool solo_window_header;
 
   // ID of the display associated with the root window.
   int64 display_id;
 
   // RootWindowController for the root window. This may be NULL
   // for the root window used for mirroring.
   RootWindowController* controller;
 };
 
-// Initializes and creates RootWindowSettings for |root|, and returns
-// the property.
+// Creates and returns RootWindowSettings for |root|.

[Daniel Erat, 2013/09/05 16:56:34]

nit: either document ownership of the returned pointer or (better) make it
return a scoped_ptr

[oshima, 2013/09/05 17:05:54]

Done. it is owned by the root window, so scoped_ptr isn't necessary.

 RootWindowSettings* InitRootWindowSettings(aura::RootWindow* root);

[Daniel Erat, 2013/09/05 16:56:34]

nit: renaming it to CreateRootWindowSettings might be more accurate

[oshima, 2013/09/05 17:05:54]

The object is owned by the root, so I think Init is better.

 
 // Returns the RootWindowSettings for |root|.
 ASH_EXPORT RootWindowSettings* GetRootWindowSettings(aura::RootWindow* root);
 
 // const version of GetRootWindowSettings.
 ASH_EXPORT const RootWindowSettings*
 GetRootWindowSettings(const aura::RootWindow* root);
 
 }  // namespace internal
 }  // namespace ash
 
-#endif  // ASH_WM_ROOT_WINDOW_SETTINGS_H_
+#endif  // ASH_ROOT_WINDOW_SETTINGS_H_