Index: ui/views_content_client/views_content_client_main_parts.h |
diff --git a/ui/views/examples/content_client/examples_browser_main_parts.h b/ui/views_content_client/views_content_client_main_parts.h |
similarity index 55% |
rename from ui/views/examples/content_client/examples_browser_main_parts.h |
rename to ui/views_content_client/views_content_client_main_parts.h |
index 80be477dfe40343f8bd34b9e3943b391375a6034..5e39361b47852e27fb5b93a0198c913b0b8001e6 100644 |
--- a/ui/views/examples/content_client/examples_browser_main_parts.h |
+++ b/ui/views_content_client/views_content_client_main_parts.h |
@@ -1,61 +1,66 @@ |
-// Copyright 2014 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 UI_VIEWS_EXAMPLES_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_ |
-#define UI_VIEWS_EXAMPLES_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_ |
- |
-#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
-#include "content/public/browser/browser_main_parts.h" |
- |
-namespace content { |
-class ShellBrowserContext; |
-struct MainFunctionParams; |
-} |
- |
-namespace wm { |
-class WMState; |
-class WMTestHelper; |
-} |
- |
-namespace views { |
-class ViewsDelegate; |
- |
-namespace examples { |
- |
-class ExamplesBrowserMainParts : public content::BrowserMainParts { |
- public: |
- explicit ExamplesBrowserMainParts( |
- const content::MainFunctionParams& parameters); |
- virtual ~ExamplesBrowserMainParts(); |
- |
- // content::BrowserMainParts: |
- virtual void ToolkitInitialized() OVERRIDE; |
- virtual void PreMainMessageLoopRun() OVERRIDE; |
- virtual bool MainMessageLoopRun(int* result_code) OVERRIDE; |
- virtual void PostMainMessageLoopRun() OVERRIDE; |
- |
- content::ShellBrowserContext* browser_context() { |
- return browser_context_.get(); |
- } |
- |
- private: |
- scoped_ptr<content::ShellBrowserContext> browser_context_; |
- |
- scoped_ptr<ViewsDelegate> views_delegate_; |
- |
-#if defined(OS_CHROMEOS) |
- // Enable a minimal set of views::corewm to be initialized. |
- scoped_ptr<wm::WMTestHelper> wm_test_helper_; |
-#endif |
- |
- scoped_ptr<wm::WMState> wm_state_; |
- |
- DISALLOW_COPY_AND_ASSIGN(ExamplesBrowserMainParts); |
-}; |
- |
-} // namespace examples |
-} // namespace views |
- |
-#endif // UI_VIEWS_EXAMPLES_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_ |
+// Copyright (c) 2012 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 UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_CLIENT_MAIN_PARTS_H_ |
+#define UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_CLIENT_MAIN_PARTS_H_ |
+ |
+#include "base/macros.h" |
+#include "base/memory/scoped_ptr.h" |
+#include "content/public/browser/browser_main_parts.h" |
+ |
+namespace content { |
+class ShellBrowserContext; |
+struct MainFunctionParams; |
+} |
+ |
+namespace views { |
+class ViewsDelegate; |
+} |
+ |
+namespace wm { |
+class WMState; |
+class WMTestHelper; |
+} |
+ |
+namespace ui { |
+ |
+class ViewsContentClient; |
+ |
+class ViewsContentClientMainParts : public content::BrowserMainParts { |
+ public: |
+ ViewsContentClientMainParts( |
+ const content::MainFunctionParams& content_params, |
+ ViewsContentClient* views_content_client); |
+ virtual ~ViewsContentClientMainParts(); |
+ |
+ // content::BrowserMainParts: |
+ virtual void ToolkitInitialized() OVERRIDE; |
+ virtual void PreMainMessageLoopRun() OVERRIDE; |
+ virtual bool MainMessageLoopRun(int* result_code) OVERRIDE; |
+ virtual void PostMainMessageLoopRun() OVERRIDE; |
+ |
+ content::ShellBrowserContext* browser_context() { |
+ return browser_context_.get(); |
+ } |
+ |
+ private: |
+ scoped_ptr<content::ShellBrowserContext> browser_context_; |
+ |
+ scoped_ptr<views::ViewsDelegate> views_delegate_; |
+ |
+#if defined(OS_CHROMEOS) |
+ // Enable a minimal set of views::corewm to be initialized. |
+ scoped_ptr<wm::WMTestHelper> wm_test_helper_; |
+#endif |
+ |
+ scoped_ptr<wm::WMState> wm_state_; |
+ |
+ ViewsContentClient* views_content_client_; |
+ |
+ DISALLOW_COPY_AND_ASSIGN(ViewsContentClientMainParts); |
+}; |
+ |
+} // namespace ui |
+ |
+#endif // UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_CLIENT_MAIN_PARTS_H_ |