ash: Fix include paths and header guards.

ash: Fix include paths and header guards.

BUG=125846
TBR=ben@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=151213

[tfarina, 2012-08-11 02:29:38]

TBRing...

[Ben Goodger (Google), 2012-08-13 15:29:33]

lgtm


On Fri, Aug 10, 2012 at 7:29 PM, <tfarina@chromium.org> wrote:

> Reviewers: Ben Goodger (Google),
>
> Message:
> TBRing...
>
> Description:
> ash: Fix include paths and header guards.
>
> BUG=125846
> TBR=ben@chromium.org
>
>
> Please review this at
http://codereview.chromium.**org/10823280/<http://codereview.chromium.org/108...
>
> SVN Base:
svn://svn.chromium.org/chrome/**trunk/src<http://svn.chromium.org/chrome/trunk/src>
>
> Affected files:
>   M chrome/browser/ui/ash/user_**action_handler.h
>   M chrome/browser/ui/ash/user_**action_handler.cc
>   M chrome/browser/ui/ash/window_**positioner.h
>   M chrome/browser/ui/ash/window_**positioner.cc
>   M chrome/browser/ui/ash/window_**positioner_unittest.cc
>
>
> Index: chrome/browser/ui/ash/user_**action_handler.cc
> diff --git a/chrome/browser/ui/ash/user_**action_handler.cc
> b/chrome/browser/ui/ash/user_**action_handler.cc
> index ce1daa2587c1f854180f86428f99cc**7bb4d8402f..**
> 3df6e671f9d4413dd4041281861165**a776ae83bf 100644
> --- a/chrome/browser/ui/ash/user_**action_handler.cc
> +++ b/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"
> Index: chrome/browser/ui/ash/user_**action_handler.h
> diff --git a/chrome/browser/ui/ash/user_**action_handler.h
> b/chrome/browser/ui/ash/user_**action_handler.h
> index aa826f5052a75e859a1587c8faf3d4**beb5eb804a..**
> ac3f7f07023e6f6273c5d9496b106c**9bcf0c9b73 100644
> --- a/chrome/browser/ui/ash/user_**action_handler.h
> +++ b/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_
> Index: chrome/browser/ui/ash/window_**positioner.cc
> diff --git a/chrome/browser/ui/ash/**window_positioner.cc
> b/chrome/browser/ui/ash/**window_positioner.cc
> index 1e1e8e2d6180a91c3a23f17e1a7f35**2b1385089a..**
> 1eb346cece0cc1fbddefaeed90873b**24d10ccb6b 100644
> --- a/chrome/browser/ui/ash/**window_positioner.cc
> +++ b/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"
> Index: chrome/browser/ui/ash/window_**positioner.h
> diff --git a/chrome/browser/ui/ash/**window_positioner.h
> b/chrome/browser/ui/ash/**window_positioner.h
> index 06551e0ff9ed1871ceb454c6e1fb26**1d6b656631..**
> e312540f36945c8d455c8107366c0f**f0b982ce50 100644
> --- a/chrome/browser/ui/ash/**window_positioner.h
> +++ b/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_
> Index: chrome/browser/ui/ash/window_**positioner_unittest.cc
> diff --git a/chrome/browser/ui/ash/**window_positioner_unittest.cc
> b/chrome/browser/ui/ash/**window_positioner_unittest.cc
> index 33ed6b7bea98e745bf198129c96028**e614b49b9a..**
> 78d1fc41e66d70d0b6aa808d7ed13a**55adfe1782 100644
> --- a/chrome/browser/ui/ash/**window_positioner_unittest.cc
> +++ b/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"
>
>
>