summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-12 22:07:36 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-12 22:07:36 +0000
commit5629e0c704b4807fd00062c8b91aeea3726fe18d (patch)
tree6bec38454b7f3709729ff1ea3090b5d828777da6 /chrome/app
parent434b02a20e5194548f6ab5868b78f14215e3614d (diff)
downloadchromium_src-5629e0c704b4807fd00062c8b91aeea3726fe18d.zip
chromium_src-5629e0c704b4807fd00062c8b91aeea3726fe18d.tar.gz
chromium_src-5629e0c704b4807fd00062c8b91aeea3726fe18d.tar.bz2
Basic scaffolding for a "content shell", i.e. test browser over the content module. Once it's working, this will allow developers working on the core chrome code/web platform/networking etc to test their changes on a much smaller and hence faster to build/run/debug browser.
This doesn't do anything yet because it's blocked on having TabContentsView implementations in content. BUG=90445 Review URL: http://codereview.chromium.org/7857019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100778 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/chrome_main.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/app/chrome_main.cc b/chrome/app/chrome_main.cc
index 8b69e3f..bc50d049 100644
--- a/chrome/app/chrome_main.cc
+++ b/chrome/app/chrome_main.cc
@@ -114,7 +114,7 @@ DLLEXPORT int __cdecl ChromeMain(HINSTANCE instance,
#elif defined(OS_POSIX)
extern "C" {
__attribute__((visibility("default")))
-int ChromeMain(int argc, char** argv);
+int ChromeMain(int argc, const char** argv);
}
#endif
@@ -743,7 +743,7 @@ DLLEXPORT int __cdecl ChromeMain(HINSTANCE instance,
ChromeMainDelegate chrome_main_delegate;
return content::ContentMain(instance, sandbox_info, &chrome_main_delegate);
#elif defined(OS_POSIX)
-int ChromeMain(int argc, char** argv) {
+int ChromeMain(int argc, const char** argv) {
ChromeMainDelegate chrome_main_delegate;
return content::ContentMain(argc, argv, &chrome_main_delegate);
#endif