diff options
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, 3 insertions, 6 deletions
diff --git a/chrome/app/chrome_main.cc b/chrome/app/chrome_main.cc index 93ff2e6..425932e 100644 --- a/chrome/app/chrome_main.cc +++ b/chrome/app/chrome_main.cc @@ -1,10 +1,10 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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/app/content_main.h" +#include "content/public/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 ceabdb8..a742401 100644 --- a/chrome/app/chrome_main_delegate.cc +++ b/chrome/app/chrome_main_delegate.cc @@ -29,9 +29,7 @@ #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" @@ -699,8 +697,7 @@ int ChromeMainDelegate::RunProcess( return kMainFunctions[i].function(main_function_params); } - NOTREACHED() << "Unknown process type: " << process_type; - return 1; + return -1; } void ChromeMainDelegate::ProcessExiting(const std::string& process_type) { |