summaryrefslogtreecommitdiffstats
path: root/chrome/app
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/app
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/app')
-rw-r--r--chrome/app/breakpad_win.cc2
-rw-r--r--chrome/app/chrome_exe_main_win.cc2
-rw-r--r--chrome/app/chrome_main.cc2
-rw-r--r--chrome/app/client_util.cc2
-rw-r--r--chrome/app/dummy_main_functions.cc2
5 files changed, 5 insertions, 5 deletions
diff --git a/chrome/app/breakpad_win.cc b/chrome/app/breakpad_win.cc
index dfff428..11dbdde 100644
--- a/chrome/app/breakpad_win.cc
+++ b/chrome/app/breakpad_win.cc
@@ -27,10 +27,10 @@
#include "chrome/common/child_process_logging.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/env_vars.h"
-#include "chrome/common/result_codes.h"
#include "chrome/installer/util/google_chrome_sxs_distribution.h"
#include "chrome/installer/util/google_update_settings.h"
#include "chrome/installer/util/install_util.h"
+#include "content/common/result_codes.h"
#include "policy/policy_constants.h"
namespace {
diff --git a/chrome/app/chrome_exe_main_win.cc b/chrome/app/chrome_exe_main_win.cc
index 296431c..28c0da4 100644
--- a/chrome/app/chrome_exe_main_win.cc
+++ b/chrome/app/chrome_exe_main_win.cc
@@ -10,7 +10,7 @@
#include "base/win/windows_version.h"
#include "chrome/app/breakpad_win.h"
#include "chrome/app/client_util.h"
-#include "chrome/common/result_codes.h"
+#include "content/common/result_codes.h"
#include "sandbox/src/dep.h"
#include "sandbox/src/sandbox_factory.h"
diff --git a/chrome/app/chrome_main.cc b/chrome/app/chrome_main.cc
index 2252546..400c637 100644
--- a/chrome/app/chrome_main.cc
+++ b/chrome/app/chrome_main.cc
@@ -33,13 +33,13 @@
#include "chrome/common/chrome_version_info.h"
#include "chrome/common/logging_chrome.h"
#include "chrome/common/profiling.h"
-#include "chrome/common/set_process_title.h"
#include "chrome/common/url_constants.h"
#include "content/browser/renderer_host/render_process_host.h"
#include "content/common/content_client.h"
#include "content/common/content_paths.h"
#include "content/common/main_function_params.h"
#include "content/common/sandbox_init_wrapper.h"
+#include "content/common/set_process_title.h"
#include "ipc/ipc_switches.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_paths.h"
diff --git a/chrome/app/client_util.cc b/chrome/app/client_util.cc
index 174d62d..38d5d11 100644
--- a/chrome/app/client_util.cc
+++ b/chrome/app/client_util.cc
@@ -19,12 +19,12 @@
#include "chrome/app/client_util.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_switches.h"
-#include "chrome/common/result_codes.h"
#include "chrome/installer/util/browser_distribution.h"
#include "chrome/installer/util/channel_info.h"
#include "chrome/installer/util/install_util.h"
#include "chrome/installer/util/google_update_constants.h"
#include "chrome/installer/util/util_constants.h"
+#include "content/common/result_codes.h"
namespace {
// The entry point signature of chrome.dll.
diff --git a/chrome/app/dummy_main_functions.cc b/chrome/app/dummy_main_functions.cc
index bb0b5e5..bc942f6 100644
--- a/chrome/app/dummy_main_functions.cc
+++ b/chrome/app/dummy_main_functions.cc
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/common/result_codes.h"
#include "content/common/main_function_params.h"
+#include "content/common/result_codes.h"
// Native Client binary for 64-bit Windows can run only the NaCl loader or
// the sandbox broker processes. Other process types are not supported.