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

Side by Side Diff: content/public/app/content_main.h

Issue 9513006: First pass at content shell for the Mac. Doesn't work yet. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef CONTENT_PUBLIC_APP_CONTENT_MAIN_H_ 5 #ifndef CONTENT_PUBLIC_APP_CONTENT_MAIN_H_
6 #define CONTENT_PUBLIC_APP_CONTENT_MAIN_H_ 6 #define CONTENT_PUBLIC_APP_CONTENT_MAIN_H_
7 #pragma once 7 #pragma once
8 8
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 #include "content/common/content_export.h" 10 #include "content/common/content_export.h"
(...skipping 15 matching lines...) Expand all
26 // startup using the ContentMainDelegate interface. The embedder can also pass 26 // startup using the ContentMainDelegate interface. The embedder can also pass
27 // in NULL for |delegate| if they don't want to override default startup. 27 // in NULL for |delegate| if they don't want to override default startup.
28 #if defined(OS_WIN) 28 #if defined(OS_WIN)
29 29
30 // |sandbox_info| should be initialized using InitializeSandboxInfo from 30 // |sandbox_info| should be initialized using InitializeSandboxInfo from
31 // content_main_win.h 31 // content_main_win.h
32 CONTENT_EXPORT int ContentMain(HINSTANCE instance, 32 CONTENT_EXPORT int ContentMain(HINSTANCE instance,
33 sandbox::SandboxInterfaceInfo* sandbox_info, 33 sandbox::SandboxInterfaceInfo* sandbox_info,
34 ContentMainDelegate* delegate); 34 ContentMainDelegate* delegate);
35 #else 35 #else
36 CONTENT_EXPORT int ContentMain(int argc, 36
37 const char** argv, 37 #if defined(OS_MACOSX)
38 ContentMainDelegate* delegate); 38 __attribute__((visibility("default")))
Mark Mentovai 2012/02/28 20:12:40 As discussed previously with respect to an “extern
Avi (use Gerrit) 2012/02/29 19:46:50 Done.
39 #endif // OS_MACOSX
40 CONTENT_EXPORT int ContentMain(int argc,
Mark Mentovai 2012/02/28 20:12:40 No new indentation here.
Avi (use Gerrit) 2012/02/29 19:46:50 Done.
41 const char** argv,
42 ContentMainDelegate* delegate);
39 #endif 43 #endif
40 44
41 } // namespace content 45 } // namespace content
42 46
43 #endif // CONTENT_PUBLIC_APP_CONTENT_MAIN_H_ 47 #endif // CONTENT_PUBLIC_APP_CONTENT_MAIN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698