summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
authordpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-15 20:07:08 +0000
committerdpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-15 20:07:08 +0000
commit785c9672b5f4e423487147904930110dae0049d9 (patch)
treec4fef8478f128c7a6aa3d49db9e8d6eb50432bbc /chrome/browser/extensions
parent6bff761d7589fc7b638de6f1ce684f559711316b (diff)
downloadchromium_src-785c9672b5f4e423487147904930110dae0049d9.zip
chromium_src-785c9672b5f4e423487147904930110dae0049d9.tar.gz
chromium_src-785c9672b5f4e423487147904930110dae0049d9.tar.bz2
This change will split the result codes between content and chrome.
This adds a new file into chrome/common and does a lot of renaming. The current version is just a sketch of the headers, and nothing will compile. R=jam@chromium.org BUG=76699 TEST=everything still compiles and runs Review URL: http://codereview.chromium.org/7377010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92730 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/extension_crash_recovery_browsertest.cc3
-rw-r--r--chrome/browser/extensions/extension_function.cc3
2 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_crash_recovery_browsertest.cc b/chrome/browser/extensions/extension_crash_recovery_browsertest.cc
index b6e9db1..c325afa 100644
--- a/chrome/browser/extensions/extension_crash_recovery_browsertest.cc
+++ b/chrome/browser/extensions/extension_crash_recovery_browsertest.cc
@@ -73,7 +73,8 @@ class ExtensionCrashRecoveryTest : public ExtensionBrowserTest {
RenderProcessHost* extension_rph =
extension_host->render_view_host()->process();
- base::KillProcess(extension_rph->GetHandle(), ResultCodes::KILLED, false);
+ base::KillProcess(extension_rph->GetHandle(), content::RESULT_CODE_KILLED,
+ false);
ASSERT_TRUE(WaitForExtensionCrash(extension_id));
ASSERT_FALSE(
GetExtensionProcessManager()->GetBackgroundHostForExtension(extension));
diff --git a/chrome/browser/extensions/extension_function.cc b/chrome/browser/extensions/extension_function.cc
index 5b814fd..0374dd0 100644
--- a/chrome/browser/extensions/extension_function.cc
+++ b/chrome/browser/extensions/extension_function.cc
@@ -112,7 +112,8 @@ void ExtensionFunction::HandleBadMessage(base::ProcessHandle process) {
NOTREACHED();
UserMetrics::RecordAction(UserMetricsAction("BadMessageTerminate_EFD"));
if (process)
- base::KillProcess(process, ResultCodes::KILLED_BAD_MESSAGE, false);
+ base::KillProcess(process, content::RESULT_CODE_KILLED_BAD_MESSAGE,
+ false);
}
}
UIThreadExtensionFunction::UIThreadExtensionFunction()