summaryrefslogtreecommitdiffstats
path: root/chrome/nacl
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-17 06:06:12 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-17 06:06:12 +0000
commit4dd5793c22cc4e9991055adcb4e7163fbba8c246 (patch)
treefb2307f59725643e4c4ce8d4f215188fd8920bdd /chrome/nacl
parent7e06cb9f6a1bfd890eebd08195a903a58912cdc9 (diff)
downloadchromium_src-4dd5793c22cc4e9991055adcb4e7163fbba8c246.zip
chromium_src-4dd5793c22cc4e9991055adcb4e7163fbba8c246.tar.gz
chromium_src-4dd5793c22cc4e9991055adcb4e7163fbba8c246.tar.bz2
Move the remaining files in chrome\common to content\common.
TBR=avi Review URL: http://codereview.chromium.org/6672070 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78516 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/nacl')
-rw-r--r--chrome/nacl/nacl_main.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/nacl/nacl_main.cc b/chrome/nacl/nacl_main.cc
index cec7168..548f21f 100644
--- a/chrome/nacl/nacl_main.cc
+++ b/chrome/nacl/nacl_main.cc
@@ -14,13 +14,13 @@
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/logging_chrome.h"
-#include "chrome/common/result_codes.h"
#include "chrome/common/sandbox_policy.h"
#include "chrome/nacl/nacl_main_platform_delegate.h"
#include "chrome/nacl/nacl_thread.h"
#include "content/common/child_process.h"
#include "content/common/hi_res_timer_manager.h"
#include "content/common/main_function_params.h"
+#include "content/common/result_codes.h"
#include "ui/base/system_monitor/system_monitor.h"
#if defined(OS_WIN)