summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/SConscript2
-rw-r--r--chrome/app/chrome_exe.vcproj2
-rw-r--r--chrome/app/chrome_exe_main.cc3
-rw-r--r--chrome/browser/browser_init.cc2
-rw-r--r--chrome/browser/browser_list.cc3
-rw-r--r--chrome/browser/browser_main.cc2
-rw-r--r--chrome/browser/browser_main_gtk.cc2
-rw-r--r--chrome/browser/browser_main_mac.mm4
-rw-r--r--chrome/browser/browser_main_win.cc3
-rw-r--r--chrome/browser/first_run.cc2
-rw-r--r--chrome/browser/hang_monitor/hung_window_detector.cc4
-rw-r--r--chrome/browser/process_singleton_win.cc2
-rw-r--r--chrome/browser/renderer_host/browser_render_process_host.cc2
-rw-r--r--chrome/browser/renderer_host/render_view_host.cc2
-rw-r--r--chrome/browser/views/hung_renderer_view.cc3
-rw-r--r--chrome/chrome.gyp2
-rw-r--r--chrome/common/process_watcher.cc3
-rw-r--r--chrome/common/result_codes.h (renamed from chrome/app/result_codes.h)7
-rw-r--r--chrome/installer/setup/uninstall.cc3
19 files changed, 22 insertions, 31 deletions
diff --git a/chrome/SConscript b/chrome/SConscript
index 8b37090..28d8de1 100644
--- a/chrome/SConscript
+++ b/chrome/SConscript
@@ -474,7 +474,7 @@ input_files = ChromeFileList([
'common/env_vars.h',
'app/google_update_client.cc',
'app/google_update_client.h',
- 'app/result_codes.h',
+ 'common/result_codes.h',
])
# We only use a separate exe/dll on Windows.
diff --git a/chrome/app/chrome_exe.vcproj b/chrome/app/chrome_exe.vcproj
index d534a30..724e365 100644
--- a/chrome/app/chrome_exe.vcproj
+++ b/chrome/app/chrome_exe.vcproj
@@ -223,7 +223,7 @@
>
</File>
<File
- RelativePath=".\result_codes.h"
+ RelativePath="..\common\result_codes.h"
>
</File>
</Files>
diff --git a/chrome/app/chrome_exe_main.cc b/chrome/app/chrome_exe_main.cc
index d8fed89..053f149 100644
--- a/chrome/app/chrome_exe_main.cc
+++ b/chrome/app/chrome_exe_main.cc
@@ -14,8 +14,8 @@
#include "chrome/app/breakpad.h"
#include "chrome/app/client_util.h"
#include "chrome/app/google_update_client.h"
-#include "chrome/app/result_codes.h"
#include "chrome/common/chrome_switches.h"
+#include "chrome/common/result_codes.h"
#include "sandbox/src/sandbox_factory.h"
#include "sandbox/src/dep.h"
@@ -105,4 +105,3 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE prev_instance,
return ResultCodes::GOOGLE_UPDATE_LAUNCH_FAILED;
}
-
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc
index 7b27a64..d4ec343 100644
--- a/chrome/browser/browser_init.cc
+++ b/chrome/browser/browser_init.cc
@@ -11,7 +11,6 @@
#include "base/path_service.h"
#include "base/string_util.h"
#include "base/sys_info.h"
-#include "chrome/app/result_codes.h"
#include "chrome/browser/autocomplete/autocomplete.h"
#include "chrome/browser/browser_list.h"
#include "chrome/browser/browser_process.h"
@@ -31,6 +30,7 @@
#include "chrome/common/l10n_util.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/pref_service.h"
+#include "chrome/common/result_codes.h"
#include "net/base/cookie_monster.h"
#include "webkit/glue/webkit_glue.h"
diff --git a/chrome/browser/browser_list.cc b/chrome/browser/browser_list.cc
index de85eba0..f583737 100644
--- a/chrome/browser/browser_list.cc
+++ b/chrome/browser/browser_list.cc
@@ -8,12 +8,12 @@
#include "base/logging.h"
#include "base/message_loop.h"
-#include "chrome/app/result_codes.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_shutdown.h"
#include "chrome/browser/browser_window.h"
#include "chrome/browser/profile_manager.h"
#include "chrome/common/notification_service.h"
+#include "chrome/common/result_codes.h"
#if defined(OS_WIN)
// TODO(port): these can probably all go away, even on win
@@ -282,4 +282,3 @@ void WebContentsIterator::Advance() {
}
}
}
-
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index e5c6972..fc4513c 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -19,7 +19,6 @@
#include "base/system_monitor.h"
#include "base/tracked_objects.h"
#include "base/values.h"
-#include "chrome/app/result_codes.h"
#include "chrome/browser/browser_main_win.h"
#include "chrome/browser/browser_init.h"
#include "chrome/browser/browser_list.h"
@@ -43,6 +42,7 @@
#include "chrome/common/main_function_params.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/pref_service.h"
+#include "chrome/common/result_codes.h"
#include "chrome/common/resource_bundle.h"
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
diff --git a/chrome/browser/browser_main_gtk.cc b/chrome/browser/browser_main_gtk.cc
index 3abc961..794fa30 100644
--- a/chrome/browser/browser_main_gtk.cc
+++ b/chrome/browser/browser_main_gtk.cc
@@ -3,8 +3,8 @@
// found in the LICENSE file.
#include "base/command_line.h"
-#include "chrome/app/result_codes.h"
#include "chrome/browser/browser_main_win.h"
+#include "chrome/common/result_codes.h"
// From browser_main_win.h, stubs until we figure out the right thing...
diff --git a/chrome/browser/browser_main_mac.mm b/chrome/browser/browser_main_mac.mm
index c5a07fd..458d54d 100644
--- a/chrome/browser/browser_main_mac.mm
+++ b/chrome/browser/browser_main_mac.mm
@@ -5,10 +5,10 @@
#include <crt_externs.h>
#include <Cocoa/Cocoa.h>
#include "base/command_line.h"
-#include "chrome/app/result_codes.h"
+#include "chrome/app/keystone_glue.h"
#include "chrome/browser/app_controller_mac.h"
#include "chrome/browser/browser_main_win.h"
-#include "chrome/app/keystone_glue.h"
+#include "chrome/common/result_codes.h"
namespace Platform {
diff --git a/chrome/browser/browser_main_win.cc b/chrome/browser/browser_main_win.cc
index a1c5056..a2fbd06 100644
--- a/chrome/browser/browser_main_win.cc
+++ b/chrome/browser/browser_main_win.cc
@@ -12,12 +12,12 @@
#include "base/command_line.h"
#include "base/path_service.h"
#include "base/win_util.h"
-#include "chrome/app/result_codes.h"
#include "chrome/browser/first_run.h"
#include "chrome/browser/metrics/metrics_service.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/env_vars.h"
#include "chrome/common/l10n_util.h"
+#include "chrome/common/result_codes.h"
#include "chrome/installer/util/helper.h"
#include "chrome/installer/util/install_util.h"
#include "chrome/installer/util/shell_util.h"
@@ -186,4 +186,3 @@ void RecordBreakpadStatusUMA(MetricsService* metrics) {
metrics->RecordBreakpadRegistration((len == 0));
metrics->RecordBreakpadHasDebugger(TRUE == ::IsDebuggerPresent());
}
-
diff --git a/chrome/browser/first_run.cc b/chrome/browser/first_run.cc
index 15e3fdb..34d94e1 100644
--- a/chrome/browser/first_run.cc
+++ b/chrome/browser/first_run.cc
@@ -20,7 +20,6 @@
#include "base/process_util.h"
#include "base/registry.h"
#include "base/string_util.h"
-#include "chrome/app/result_codes.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
@@ -33,6 +32,7 @@
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/pref_service.h"
+#include "chrome/common/result_codes.h"
#include "chrome/installer/util/browser_distribution.h"
#include "chrome/installer/util/google_update_constants.h"
#include "chrome/installer/util/google_update_settings.h"
diff --git a/chrome/browser/hang_monitor/hung_window_detector.cc b/chrome/browser/hang_monitor/hung_window_detector.cc
index 129a3c7..947a3f7 100644
--- a/chrome/browser/hang_monitor/hung_window_detector.cc
+++ b/chrome/browser/hang_monitor/hung_window_detector.cc
@@ -8,7 +8,7 @@
#include <atlbase.h>
#include "base/logging.h"
-#include "chrome/app/result_codes.h"
+#include "chrome/common/result_codes.h"
// How long do we wait for the terminated thread or process to die (in ms)
static const int kTerminateTimeout = 2000;
@@ -173,5 +173,3 @@ BOOL CALLBACK HungWindowDetector::ChildWndEnumProc(HWND child_window,
return detector_instance->CheckChildWindow(child_window);
}
-
-
diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc
index 978fcf89..f082c8c 100644
--- a/chrome/browser/process_singleton_win.cc
+++ b/chrome/browser/process_singleton_win.cc
@@ -8,7 +8,6 @@
#include "base/command_line.h"
#include "base/process_util.h"
#include "base/win_util.h"
-#include "chrome/app/result_codes.h"
#include "chrome/browser/browser_init.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/profile.h"
@@ -16,6 +15,7 @@
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/l10n_util.h"
+#include "chrome/common/result_codes.h"
#include "chrome/common/win_util.h"
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index 1c00fb7..2548d55 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -23,7 +23,6 @@
#include "base/singleton.h"
#include "base/string_util.h"
#include "base/thread.h"
-#include "chrome/app/result_codes.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/cache_manager_host.h"
#include "chrome/browser/extensions/user_script_master.h"
@@ -43,6 +42,7 @@
#include "chrome/common/pref_service.h"
#include "chrome/common/process_watcher.h"
#include "chrome/common/render_messages.h"
+#include "chrome/common/result_codes.h"
#include "chrome/renderer/render_process.h"
#include "grit/generated_resources.h"
diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc
index 1ea4512..f4349a1 100644
--- a/chrome/browser/renderer_host/render_view_host.cc
+++ b/chrome/browser/renderer_host/render_view_host.cc
@@ -10,7 +10,6 @@
#include "base/gfx/native_widget_types.h"
#include "base/string_util.h"
#include "base/waitable_event.h"
-#include "chrome/app/result_codes.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/cross_site_request_manager.h"
#include "chrome/browser/debugger/debugger_wrapper.h"
@@ -29,6 +28,7 @@
#include "chrome/common/resource_bundle.h"
#include "chrome/common/notification_service.h"
#include "chrome/common/notification_type.h"
+#include "chrome/common/result_codes.h"
#include "chrome/common/url_constants.h"
#include "chrome/common/thumbnail_score.h"
#include "net/base/net_util.h"
diff --git a/chrome/browser/views/hung_renderer_view.cc b/chrome/browser/views/hung_renderer_view.cc
index a293bb9..da026f9 100644
--- a/chrome/browser/views/hung_renderer_view.cc
+++ b/chrome/browser/views/hung_renderer_view.cc
@@ -4,7 +4,6 @@
#include "chrome/browser/views/hung_renderer_view.h"
-#include "chrome/app/result_codes.h"
#include "chrome/browser/browser_list.h"
#include "chrome/browser/renderer_host/render_process_host.h"
#include "chrome/browser/renderer_host/render_view_host.h"
@@ -15,6 +14,7 @@
#include "chrome/common/gfx/path.h"
#include "chrome/common/logging_chrome.h"
#include "chrome/common/resource_bundle.h"
+#include "chrome/common/result_codes.h"
#include "chrome/views/client_view.h"
#include "chrome/views/dialog_delegate.h"
#include "chrome/views/grid_layout.h"
@@ -449,4 +449,3 @@ void HungRendererWarning::HideForWebContents(WebContents* contents) {
if (!logging::DialogsAreSuppressed() && instance_)
instance_->EndForWebContents(contents);
}
-
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 6f1d788..35a243b 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -243,6 +243,7 @@
'common/resource_bundle_win.cc',
'common/resource_dispatcher.cc',
'common/resource_dispatcher.h',
+ 'common/result_codes.h',
'common/sandbox_init_wrapper.cc',
'common/sandbox_init_wrapper.h',
'common/scoped_vector.h',
@@ -1331,7 +1332,6 @@
'app/google_update_client.h',
'app/keystone_glue.h',
'app/keystone_glue.m',
- 'app/result_codes.h',
'app/scoped_ole_initializer.h',
],
'mac_bundle_resources': [
diff --git a/chrome/common/process_watcher.cc b/chrome/common/process_watcher.cc
index b43e2db..1ee7edf 100644
--- a/chrome/common/process_watcher.cc
+++ b/chrome/common/process_watcher.cc
@@ -7,8 +7,8 @@
#include "base/message_loop.h"
#include "base/object_watcher.h"
#include "base/sys_info.h"
-#include "chrome/app/result_codes.h"
#include "chrome/common/env_vars.h"
+#include "chrome/common/result_codes.h"
// Maximum amount of time (in milliseconds) to wait for the process to exit.
static const int kWaitInterval = 2000;
@@ -91,4 +91,3 @@ void ProcessWatcher::EnsureProcessTerminated(base::ProcessHandle process) {
new TimerExpiredTask(process),
kWaitInterval);
}
-
diff --git a/chrome/app/result_codes.h b/chrome/common/result_codes.h
index 950863e..f97e918 100644
--- a/chrome/app/result_codes.h
+++ b/chrome/common/result_codes.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_APP_RESULT_CODES_H__
-#define CHROME_APP_RESULT_CODES_H__
+#ifndef CHROME_COMMON_RESULT_CODES_H_
+#define CHROME_COMMON_RESULT_CODES_H_
#include "base/process_util.h"
@@ -44,5 +44,4 @@ class ResultCodes {
};
};
-#endif // CHROME_APP_RESULT_CODES_H__
-
+#endif // CHROME_COMMON_RESULT_CODES_H_
diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc
index cdc2f78..69b5a5d 100644
--- a/chrome/installer/setup/uninstall.cc
+++ b/chrome/installer/setup/uninstall.cc
@@ -10,7 +10,7 @@
#include "base/path_service.h"
#include "base/registry.h"
#include "base/string_util.h"
-#include "chrome/app/result_codes.h"
+#include "chrome/common/result_codes.h"
#include "chrome/installer/setup/setup.h"
#include "chrome/installer/setup/setup_constants.h"
#include "chrome/installer/util/browser_distribution.h"
@@ -279,4 +279,3 @@ installer_util::InstallStatus installer_setup::UninstallChrome(
}
return installer_util::UNINSTALL_SUCCESSFUL;
}
-
generated by cgit v1.1 at 2025-01-16 17:08:36 +0000