ash: Fix include paths and header guards.

BUG=125846
TBR=ben@chromium.org

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

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

chrome/browser/ui/ash/user_action_handler.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/views/ash/user_action_handler.h"
+#include "chrome/browser/ui/ash/user_action_handler.h"
 
 #include "ash/wm/window_util.h"
 #include "chrome/browser/ui/browser.h"

chrome/browser/ui/ash/user_action_handler.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 CHROME_BROWSER_UI_VIEWS_ASH_USER_ACTION_HANDLER_H_
-#define CHROME_BROWSER_UI_VIEWS_ASH_USER_ACTION_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_ASH_USER_ACTION_HANDLER_H_
+#define CHROME_BROWSER_UI_ASH_USER_ACTION_HANDLER_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ -22,4 +22,4 @@ class UserActionHandler : public aura::client::UserActionClient {
   DISALLOW_COPY_AND_ASSIGN(UserActionHandler);
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_ASH_USER_ACTION_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_ASH_USER_ACTION_HANDLER_H_

chrome/browser/ui/ash/window_positioner.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/views/ash/window_positioner.h"
+#include "chrome/browser/ui/ash/window_positioner.h"
 
 #include "ash/shell.h"
 #include "ash/wm/window_cycle_controller.h"

chrome/browser/ui/ash/window_positioner.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 CHROME_BROWSER_UI_VIEWS_ASH_WINDOW_POSITIONER_H_
-#define CHROME_BROWSER_UI_VIEWS_ASH_WINDOW_POSITIONER_H_
+#ifndef CHROME_BROWSER_UI_ASH_WINDOW_POSITIONER_H_
+#define CHROME_BROWSER_UI_ASH_WINDOW_POSITIONER_H_
 
 #include "base/basictypes.h"
 #include "ui/gfx/rect.h"
@@ -61,4 +61,4 @@ class WindowPositioner {
   DISALLOW_COPY_AND_ASSIGN(WindowPositioner);
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_ASH_WINDOW_POSITIONER_H_
+#endif  // CHROME_BROWSER_UI_ASH_WINDOW_POSITIONER_H_

chrome/browser/ui/ash/window_positioner_unittest.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/views/ash/window_positioner.h"
+#include "chrome/browser/ui/ash/window_positioner.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"