Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(197)

Side by Side Diff: chrome/browser/google/google_update_win.cc

Issue 1967773004: Fix include path for moved thread_task_runner_handle.h header in chrome/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@a1_move_task_runner_handle
Patch Set: merge up to r393013 Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "chrome/browser/google/google_update_win.h" 5 #include "chrome/browser/google/google_update_win.h"
6 6
7 #include <atlbase.h> 7 #include <atlbase.h>
8 #include <atlcom.h> 8 #include <atlcom.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 #include <string.h> 10 #include <string.h>
11 11
12 #include <vector> 12 #include <vector>
13 13
14 #include "base/bind.h" 14 #include "base/bind.h"
15 #include "base/callback.h" 15 #include "base/callback.h"
16 #include "base/files/file_path.h" 16 #include "base/files/file_path.h"
17 #include "base/location.h" 17 #include "base/location.h"
18 #include "base/macros.h" 18 #include "base/macros.h"
19 #include "base/metrics/histogram.h" 19 #include "base/metrics/histogram.h"
20 #include "base/metrics/sparse_histogram.h" 20 #include "base/metrics/sparse_histogram.h"
21 #include "base/path_service.h" 21 #include "base/path_service.h"
22 #include "base/sequenced_task_runner_helpers.h" 22 #include "base/sequenced_task_runner_helpers.h"
23 #include "base/single_thread_task_runner.h" 23 #include "base/single_thread_task_runner.h"
24 #include "base/strings/string_util.h" 24 #include "base/strings/string_util.h"
25 #include "base/strings/stringprintf.h" 25 #include "base/strings/stringprintf.h"
26 #include "base/strings/utf_string_conversions.h" 26 #include "base/strings/utf_string_conversions.h"
27 #include "base/thread_task_runner_handle.h" 27 #include "base/threading/thread_task_runner_handle.h"
28 #include "base/time/time.h" 28 #include "base/time/time.h"
29 #include "base/win/scoped_bstr.h" 29 #include "base/win/scoped_bstr.h"
30 #include "base/win/windows_version.h" 30 #include "base/win/windows_version.h"
31 #include "chrome/common/url_constants.h" 31 #include "chrome/common/url_constants.h"
32 #include "chrome/grit/generated_resources.h" 32 #include "chrome/grit/generated_resources.h"
33 #include "chrome/installer/util/browser_distribution.h" 33 #include "chrome/installer/util/browser_distribution.h"
34 #include "chrome/installer/util/helper.h" 34 #include "chrome/installer/util/helper.h"
35 #include "chrome/installer/util/install_util.h" 35 #include "chrome/installer/util/install_util.h"
36 #include "ui/base/l10n/l10n_util.h" 36 #include "ui/base/l10n/l10n_util.h"
37 #include "ui/base/win/atl_module.h" 37 #include "ui/base/win/atl_module.h"
(...skipping 789 matching lines...) Expand 10 before | Expand all | Expand 10 after
827 const GoogleUpdate3ClassFactory& google_update_factory) { 827 const GoogleUpdate3ClassFactory& google_update_factory) {
828 if (g_google_update_factory) { 828 if (g_google_update_factory) {
829 delete g_google_update_factory; 829 delete g_google_update_factory;
830 g_google_update_factory = nullptr; 830 g_google_update_factory = nullptr;
831 } 831 }
832 if (!google_update_factory.is_null()) { 832 if (!google_update_factory.is_null()) {
833 g_google_update_factory = 833 g_google_update_factory =
834 new GoogleUpdate3ClassFactory(google_update_factory); 834 new GoogleUpdate3ClassFactory(google_update_factory);
835 } 835 }
836 } 836 }
OLDNEW
« no previous file with comments | « chrome/browser/favicon/content_favicon_driver_browsertest.cc ('k') | chrome/browser/google/google_update_win_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698