Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1094)

Unified Diff: wm/shell/content_client/shell_main_delegate.h

Issue 11485006: Add window manager component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase and add proper use_wm flag support Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 71%
copy from ash/shell/content_client/shell_main_delegate.h
copy to wm/shell/content_client/shell_main_delegate.h
index a491d4651a0d7e587f1717dc95e4bdf194772be3..3a2e1a64cf63b552986577523ce74c0cd9b958be 100644
--- a/ash/shell/content_client/shell_main_delegate.h
+++ b/wm/shell/content_client/shell_main_delegate.h
@@ -2,21 +2,14 @@
// 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_

Powered by Google App Engine
This is Rietveld 408576698