diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-19 17:43:21 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-19 17:43:21 +0000 |
commit | bdcf915f370e489bb9b7934feca5711b3cc6bece (patch) | |
tree | f67a450b1859c8e8565d1b150e7ca9915241938c /content/shell/shell_main.cc | |
parent | d346c5e45c83968c9d85c9ee8f792a6f001fa5c8 (diff) | |
download | chromium_src-bdcf915f370e489bb9b7934feca5711b3cc6bece.zip chromium_src-bdcf915f370e489bb9b7934feca5711b3cc6bece.tar.gz chromium_src-bdcf915f370e489bb9b7934feca5711b3cc6bece.tar.bz2 |
Move content_shell and content_browsertests code into the content namespace.
BUG=90448
TBR=jochen
Review URL: https://chromiumcodereview.appspot.com/10809016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147473 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/shell_main.cc')
-rw-r--r-- | content/shell/shell_main.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/shell/shell_main.cc b/content/shell/shell_main.cc index 62d6ea9..d03831b 100644 --- a/content/shell/shell_main.cc +++ b/content/shell/shell_main.cc @@ -20,7 +20,7 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t*, int) { sandbox::SandboxInterfaceInfo sandbox_info = {0}; content::InitializeSandboxInfo(&sandbox_info); - ShellMainDelegate delegate; + content::ShellMainDelegate delegate; return content::ContentMain(instance, &sandbox_info, &delegate); } @@ -32,7 +32,7 @@ int main(int argc, const char** argv) { // delegate types. return ::ContentMain(argc, argv); #else - ShellMainDelegate delegate; + content::ShellMainDelegate delegate; return content::ContentMain(argc, argv, &delegate); #endif // OS_MACOSX } |