diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-06 18:46:35 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-06 18:46:35 +0000 |
| commit | 9e49959b0e6e940c39359f5f05f9d5da6032a869 (patch) | |
| tree | a1059820b0bf8129bcf571966891ce122453465e /chrome/app | |
| parent | 4a8e0f3d4b33c1b69021575d7b971da7b17340ae (diff) | |
| download | chromium_src-9e49959b0e6e940c39359f5f05f9d5da6032a869.zip chromium_src-9e49959b0e6e940c39359f5f05f9d5da6032a869.tar.gz chromium_src-9e49959b0e6e940c39359f5f05f9d5da6032a869.tar.bz2 | |
Revert "Support sharing of ContentMain and BrowserMain code with embedded use cases."
This reverts commit r120574. Test failures.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120581 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/chrome_main.cc | 4 | ||||
| -rw-r--r-- | chrome/app/chrome_main_delegate.cc | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/chrome/app/chrome_main.cc b/chrome/app/chrome_main.cc index 425932e..93ff2e6 100644 --- a/chrome/app/chrome_main.cc +++ b/chrome/app/chrome_main.cc @@ -1,10 +1,10 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "chrome/app/chrome_main_delegate.h" -#include "content/public/app/content_main.h" +#include "content/app/content_main.h" #if defined(OS_WIN) #define DLLEXPORT __declspec(dllexport) diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc index a742401..ceabdb8 100644 --- a/chrome/app/chrome_main_delegate.cc +++ b/chrome/app/chrome_main_delegate.cc @@ -29,7 +29,9 @@ #include "chrome/plugin/chrome_content_plugin_client.h" #include "chrome/renderer/chrome_content_renderer_client.h" #include "chrome/utility/chrome_content_utility_client.h" +#include "content/app/content_main.h" #include "content/common/content_counters.h" +#include "content/public/app/content_main_delegate.h" #include "content/public/browser/render_process_host.h" #include "content/public/common/content_client.h" #include "content/public/common/content_paths.h" @@ -697,7 +699,8 @@ int ChromeMainDelegate::RunProcess( return kMainFunctions[i].function(main_function_params); } - return -1; + NOTREACHED() << "Unknown process type: " << process_type; + return 1; } void ChromeMainDelegate::ProcessExiting(const std::string& process_type) { |