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

Unified Diff: chrome/app/chrome_main_delegate.cc

Issue 9372027: Revert 121236 - Support sharing of ContentMain and BrowserMain code with embedded use cases (try ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/app/chrome_main.cc ('k') | chrome/browser/chrome_browser_main.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/chrome_main_delegate.cc
===================================================================
--- chrome/app/chrome_main_delegate.cc (revision 121244)
+++ chrome/app/chrome_main_delegate.cc (working copy)
@@ -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 @@
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) {
« no previous file with comments | « chrome/app/chrome_main.cc ('k') | chrome/browser/chrome_browser_main.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698