fix macro, comments and unused includes

BUG=none

Review URL: https://chromiumcodereview.appspot.com/23591028

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221499 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 8 insertions, 20 deletions

diff --git a/ash/root_window_settings.cc b/ash/root_window_settings.cc
index a5e3968..06198ca 100644
--- a/ash/root_window_settings.cc
+++ b/ash/root_window_settings.cc
@@ -23,9 +23,9 @@ RootWindowSettings::RootWindowSettings()
 }
 
 RootWindowSettings* InitRootWindowSettings(aura::RootWindow* root) {
-  RootWindowSettings* property = new RootWindowSettings();
-  root->SetProperty(kRootWindowSettingsKey, property);
-  return property;
+  RootWindowSettings* settings = new RootWindowSettings();
+  root->SetProperty(kRootWindowSettingsKey, settings);
+  return settings;
 }
 
 RootWindowSettings* GetRootWindowSettings(aura::RootWindow* root) {
diff --git a/ash/root_window_settings.h b/ash/root_window_settings.h
index 5dc3363..784cce6 100644
--- a/ash/root_window_settings.h
+++ b/ash/root_window_settings.h
@@ -2,8 +2,8 @@
 // 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"
@@ -35,8 +35,8 @@ struct RootWindowSettings {
   RootWindowController* controller;
 };
 
-// Initializes and creates RootWindowSettings for |root|, and returns
-// the property.
+// Initializes and returns RootWindowSettings for |root|.
+// It is owned by the |root|.
 RootWindowSettings* InitRootWindowSettings(aura::RootWindow* root);
 
 // Returns the RootWindowSettings for |root|.
@@ -49,4 +49,4 @@ GetRootWindowSettings(const aura::RootWindow* root);
 }  // namespace internal
 }  // namespace ash
 
-#endif  // ASH_WM_ROOT_WINDOW_SETTINGS_H_
+#endif  // ASH_ROOT_WINDOW_SETTINGS_H_
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc
index 2a22df0..6975c16 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc
@@ -7,21 +7,14 @@
 #include "apps/native_app_window.h"
 #include "apps/shell_window.h"
 #include "apps/shell_window_registry.h"
-#include "ash/ash_switches.h"
 #include "ash/host/root_window_host_factory.h"
-#include "ash/launcher/launcher_types.h"
 #include "ash/magnifier/magnifier_constants.h"
 #include "ash/session_state_delegate.h"
-#include "ash/shelf/shelf_widget.h"
 #include "ash/system/tray/system_tray_delegate.h"
-#include "ash/wm/window_properties.h"
 #include "ash/wm/window_util.h"
-#include "base/bind.h"
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
-#include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
-#include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
@@ -39,13 +32,10 @@
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/host_desktop.h"
-#include "chrome/browser/ui/immersive_fullscreen_configuration.h"
 #include "chrome/common/chrome_switches.h"
-#include "content/public/browser/notification_service.h"
 #include "content/public/browser/user_metrics.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
-#include "ui/aura/client/user_action_client.h"
 #include "ui/aura/window.h"
 #include "ui/base/l10n/l10n_util.h"
 
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc b/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
index 29422a1..b6c1f29 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
@@ -26,13 +26,11 @@
 #include "chrome/browser/speech/tts_controller.h"
 #include "chrome/browser/ui/ash/caps_lock_delegate_chromeos.h"
 #include "chrome/browser/ui/ash/session_state_delegate_chromeos.h"
-#include "chrome/browser/ui/ash/window_positioner.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
 #include "chrome/browser/ui/webui/chrome_web_contents_handler.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chromeos/chromeos_switches.h"