| Index: wm/shell/content_client/shell_content_browser_client.h
|
| diff --git a/ash/shell/content_client/shell_content_browser_client.h b/wm/shell/content_client/shell_content_browser_client.h
|
| similarity index 67%
|
| copy from ash/shell/content_client/shell_content_browser_client.h
|
| copy to wm/shell/content_client/shell_content_browser_client.h
|
| index f4df45ecda5033b9651c274584c88dc9df0fec28..0390b1aa6d163077c651238b862ccd3433baca04 100644
|
| --- a/ash/shell/content_client/shell_content_browser_client.h
|
| +++ b/wm/shell/content_client/shell_content_browser_client.h
|
| @@ -1,22 +1,18 @@
|
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 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_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_
|
| -#define ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_
|
| +#ifndef WM_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_
|
| +#define WM_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_
|
|
|
| -#include <string>
|
| -
|
| -#include "base/compiler_specific.h"
|
| #include "content/public/browser/content_browser_client.h"
|
|
|
| namespace content {
|
| class ShellBrowserContext;
|
| class ShellBrowserMainParts;
|
| -class ShellResourceDispatcherHostDelegate;
|
| }
|
|
|
| -namespace ash {
|
| +namespace wm {
|
| namespace shell {
|
|
|
| class ShellBrowserMainParts;
|
| @@ -39,6 +35,6 @@ class ShellContentBrowserClient : public content::ContentBrowserClient {
|
| };
|
|
|
| } // namespace shell
|
| -} // namespace ash
|
| +} // namespace wm
|
|
|
| -#endif // ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_
|
| +#endif // WM_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_
|
|
|