| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "win8/delegate_execute/chrome_util.h" | 5 #include "win8/delegate_execute/chrome_util.h" |
| 6 | 6 |
| 7 #include <windows.h> | 7 #include <windows.h> |
| 8 #include <atlbase.h> | 8 #include <atlbase.h> |
| 9 #include <shlobj.h> | 9 #include <shlobj.h> |
| 10 | 10 |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 #include "base/strings/utf_string_conversions.h" | 22 #include "base/strings/utf_string_conversions.h" |
| 23 #include "base/win/registry.h" | 23 #include "base/win/registry.h" |
| 24 #include "base/win/scoped_comptr.h" | 24 #include "base/win/scoped_comptr.h" |
| 25 #include "base/win/scoped_handle.h" | 25 #include "base/win/scoped_handle.h" |
| 26 #include "base/win/win_util.h" | 26 #include "base/win/win_util.h" |
| 27 #include "chrome/installer/util/browser_distribution.h" | 27 #include "chrome/installer/util/browser_distribution.h" |
| 28 #include "chrome/installer/util/install_util.h" | 28 #include "chrome/installer/util/install_util.h" |
| 29 #include "chrome/installer/util/util_constants.h" | 29 #include "chrome/installer/util/util_constants.h" |
| 30 | 30 |
| 31 #if defined(GOOGLE_CHROME_BUILD) | 31 #if defined(GOOGLE_CHROME_BUILD) |
| 32 #include "google_update/google_update_idl.h" | 32 #include "google_update/google_update_idl.h" // nogncheck |
| 33 #endif | 33 #endif |
| 34 | 34 |
| 35 namespace { | 35 namespace { |
| 36 | 36 |
| 37 #if defined(GOOGLE_CHROME_BUILD) | 37 #if defined(GOOGLE_CHROME_BUILD) |
| 38 | 38 |
| 39 // TODO(grt): These constants live in installer_util. Consider moving them | 39 // TODO(grt): These constants live in installer_util. Consider moving them |
| 40 // into common_constants to allow for reuse. | 40 // into common_constants to allow for reuse. |
| 41 const base::FilePath::CharType kNewChromeExe[] = | 41 const base::FilePath::CharType kNewChromeExe[] = |
| 42 FILE_PATH_LITERAL("new_chrome.exe"); | 42 FILE_PATH_LITERAL("new_chrome.exe"); |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 158 AtlTrace("%hs. Failed to finalize update with exit code %d.\n", | 158 AtlTrace("%hs. Failed to finalize update with exit code %d.\n", |
| 159 __FUNCTION__, exit_code); | 159 __FUNCTION__, exit_code); |
| 160 } else { | 160 } else { |
| 161 AtlTrace("%hs. Finalized pending update.\n", __FUNCTION__); | 161 AtlTrace("%hs. Finalized pending update.\n", __FUNCTION__); |
| 162 } | 162 } |
| 163 } | 163 } |
| 164 #endif | 164 #endif |
| 165 } | 165 } |
| 166 | 166 |
| 167 } // delegate_execute | 167 } // delegate_execute |
| OLD | NEW |