From 1f06a56edde410253186f4b6b5cdfe516f0bb4ff Mon Sep 17 00:00:00 2001 From: "jam@chromium.org" Date: Tue, 1 Mar 2011 06:20:49 +0000 Subject: Fix newline endings. I can't do this with gcl because svn cat gives an error git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76361 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/google/google_update.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'chrome/browser/google') diff --git a/chrome/browser/google/google_update.cc b/chrome/browser/google/google_update.cc index a218797..feff84c 100644 --- a/chrome/browser/google/google_update.cc +++ b/chrome/browser/google/google_update.cc @@ -16,24 +16,24 @@ #include "base/threading/thread.h" #include "base/win/registry.h" #include "base/win/windows_version.h" -#include "chrome/browser/browser_thread.h" #include "chrome/installer/util/browser_distribution.h" #include "chrome/installer/util/google_update_constants.h" #include "chrome/installer/util/helper.h" #include "chrome/installer/util/install_util.h" +#include "content/browser/browser_thread.h" #include "views/window/window.h" #include "google_update_idl_i.c" using views::Window; namespace { - -// The registry location of the Google Update policies. -const wchar_t kGUPolicyRegistrySubKey[] = - L"SOFTWARE\\Policies\\Google\\Update"; -const wchar_t kGUPolicyGlobalValue[] = L"UpdateDefault"; -const wchar_t kGUPolicyAppValuePrefix[] = L"Update"; -const DWORD kGUPolicyUpdatesDisabled = 0; + +// The registry location of the Google Update policies. +const wchar_t kGUPolicyRegistrySubKey[] = + L"SOFTWARE\\Policies\\Google\\Update"; +const wchar_t kGUPolicyGlobalValue[] = L"UpdateDefault"; +const wchar_t kGUPolicyAppValuePrefix[] = L"Update"; +const DWORD kGUPolicyUpdatesDisabled = 0; // Checks if the updates have been disabled by policy. bool IsUpdateDisabledByPolicy(const std::wstring& guid) { -- cgit v1.1