Index: wm/shell/content_client/shell_main_delegate.h |
diff --git a/ash/shell/content_client/shell_main_delegate.h b/wm/shell/content_client/shell_main_delegate.h |
similarity index 66% |
copy from ash/shell/content_client/shell_main_delegate.h |
copy to wm/shell/content_client/shell_main_delegate.h |
index a491d4651a0d7e587f1717dc95e4bdf194772be3..48eacf8d6588638e4ba3e1a1156e9c415ebfc495 100644 |
--- a/ash/shell/content_client/shell_main_delegate.h |
+++ b/wm/shell/content_client/shell_main_delegate.h |
@@ -1,22 +1,15 @@ |
-// 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_MAIN_DELEGATE_H_ |
-#define ASH_SHELL_CONTENT_CLIENT_SHELL_MAIN_DELEGATE_H_ |
+#ifndef WM_SHELL_CONTENT_CLIENT_SHELL_MAIN_DELEGATE_H_ |
+#define WM_SHELL_CONTENT_CLIENT_SHELL_MAIN_DELEGATE_H_ |
-#include "base/compiler_specific.h" |
#include "base/memory/scoped_ptr.h" |
-#include "content/shell/shell_content_client.h" |
#include "content/public/app/content_main_delegate.h" |
+#include "content/shell/shell_content_client.h" |
-namespace content { |
-class ShellContentRendererClient; |
-class ShellContentPluginClient; |
-class ShellContentUtilityClient; |
-} |
- |
-namespace ash { |
+namespace wm { |
namespace shell { |
class ShellContentBrowserClient; |
@@ -40,6 +33,6 @@ class ShellMainDelegate : public content::ContentMainDelegate { |
}; |
} // namespace shell |
-} // namespace ash |
+} // namespace wm |
-#endif // ASH_SHELL_CONTENT_CLIENT_SHELL_MAIN_DELEGATE_H_ |
+#endif // WM_SHELL_CONTENT_CLIENT_SHELL_MAIN_DELEGATE_H_ |