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

Side by Side Diff: athena/main/athena_main.cc

Issue 489763002: MacViews: Gets a webview working in views_examples_with_content_exe Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase to master Created 6 years, 3 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « athena/content/web_contents_view_delegate_factory_impl.cc ('k') | build/common.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "athena/activity/public/activity_factory.h" 5 #include "athena/activity/public/activity_factory.h"
6 #include "athena/activity/public/activity_manager.h" 6 #include "athena/activity/public/activity_manager.h"
7 #include "athena/content/public/web_contents_view_delegate_creator.h" 7 #include "athena/content/public/web_contents_view_delegate_creator.h"
8 #include "athena/env/public/athena_env.h" 8 #include "athena/env/public/athena_env.h"
9 #include "athena/extensions/public/extensions_delegate.h" 9 #include "athena/extensions/public/extensions_delegate.h"
10 #include "athena/main/athena_launcher.h" 10 #include "athena/main/athena_launcher.h"
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 class AthenaContentBrowserClient 107 class AthenaContentBrowserClient
108 : public extensions::ShellContentBrowserClient { 108 : public extensions::ShellContentBrowserClient {
109 public: 109 public:
110 AthenaContentBrowserClient() 110 AthenaContentBrowserClient()
111 : extensions::ShellContentBrowserClient(new AthenaBrowserMainDelegate()) { 111 : extensions::ShellContentBrowserClient(new AthenaBrowserMainDelegate()) {
112 } 112 }
113 virtual ~AthenaContentBrowserClient() {} 113 virtual ~AthenaContentBrowserClient() {}
114 114
115 // content::ContentBrowserClient: 115 // content::ContentBrowserClient:
116 virtual content::WebContentsViewDelegate* GetWebContentsViewDelegate( 116 virtual content::WebContentsViewDelegate* GetWebContentsViewDelegate(
117 content::WebContents* web_contents) OVERRIDE { 117 content::WebContents* web_contents, gfx::NativeView context) OVERRIDE {
118 return athena::CreateWebContentsViewDelegate(web_contents); 118 return athena::CreateWebContentsViewDelegate(web_contents);
119 } 119 }
120 120
121 private: 121 private:
122 DISALLOW_COPY_AND_ASSIGN(AthenaContentBrowserClient); 122 DISALLOW_COPY_AND_ASSIGN(AthenaContentBrowserClient);
123 }; 123 };
124 124
125 class AthenaMainDelegate : public extensions::ShellMainDelegate { 125 class AthenaMainDelegate : public extensions::ShellMainDelegate {
126 public: 126 public:
127 AthenaMainDelegate() {} 127 AthenaMainDelegate() {}
(...skipping 19 matching lines...) Expand all
147 147
148 int main(int argc, const char** argv) { 148 int main(int argc, const char** argv) {
149 AthenaMainDelegate delegate; 149 AthenaMainDelegate delegate;
150 content::ContentMainParams params(&delegate); 150 content::ContentMainParams params(&delegate);
151 151
152 params.argc = argc; 152 params.argc = argc;
153 params.argv = argv; 153 params.argv = argv;
154 154
155 return content::ContentMain(params); 155 return content::ContentMain(params);
156 } 156 }
OLDNEW
« no previous file with comments | « athena/content/web_contents_view_delegate_factory_impl.cc ('k') | build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698