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

Unified Diff: ui/views_content_client/views_content_client_main_parts.h

Issue 297143009: MacViews: Gets views_examples_with_content_exe compiling on Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase to master Created 6 years, 7 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: ui/views_content_client/views_content_client_main_parts.h
diff --git a/ui/views_content_client/views_content_client_main_parts.h b/ui/views_content_client/views_content_client_main_parts.h
index bfaf0919588c9a7580738ac01afdc9c880880211..113e352953bc9d63e3e1c48f40da6b5cab23b8ec 100644
--- a/ui/views_content_client/views_content_client_main_parts.h
+++ b/ui/views_content_client/views_content_client_main_parts.h
@@ -18,24 +18,20 @@ namespace views {
class ViewsDelegate;
}
-namespace wm {
-class WMState;
-class WMTestHelper;
-}
-
namespace ui {
class ViewsContentClient;
class ViewsContentClientMainParts : public content::BrowserMainParts {
public:
- ViewsContentClientMainParts(
+ // Platform-specific create function.
+ static ViewsContentClientMainParts* Create(
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;
@@ -44,18 +40,20 @@ class ViewsContentClientMainParts : public content::BrowserMainParts {
return browser_context_.get();
}
+ ViewsContentClient* views_content_client() {
+ return views_content_client_;
+ }
+
+ protected:
+ ViewsContentClientMainParts(
+ const content::MainFunctionParams& content_params,
+ ViewsContentClient* views_content_client);
+
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);
« no previous file with comments | « ui/views_content_client/views_content_client.gyp ('k') | ui/views_content_client/views_content_client_main_parts.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698