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

Side by Side Diff: chrome/browser/chrome_browser_main_win.cc

Issue 2691263002: Revert of Remove header dependencies from sequence_checker.h to sequenced_worker_pool.h (Closed)
Patch Set: Created 3 years, 10 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/chrome_browser_main_win.h" 5 #include "chrome/browser/chrome_browser_main_win.h"
6 6
7 #include <shellapi.h> 7 #include <shellapi.h>
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 #include <windows.h> 10 #include <windows.h>
11 11
12 #include <algorithm> 12 #include <algorithm>
13 #include <memory> 13 #include <memory>
14 14
15 #include "base/base_switches.h" 15 #include "base/base_switches.h"
16 #include "base/command_line.h" 16 #include "base/command_line.h"
17 #include "base/environment.h" 17 #include "base/environment.h"
18 #include "base/files/file_enumerator.h" 18 #include "base/files/file_enumerator.h"
19 #include "base/files/file_path.h" 19 #include "base/files/file_path.h"
20 #include "base/files/file_util.h" 20 #include "base/files/file_util.h"
21 #include "base/i18n/rtl.h" 21 #include "base/i18n/rtl.h"
22 #include "base/location.h" 22 #include "base/location.h"
23 #include "base/macros.h" 23 #include "base/macros.h"
24 #include "base/metrics/histogram_macros.h" 24 #include "base/metrics/histogram_macros.h"
25 #include "base/path_service.h" 25 #include "base/path_service.h"
26 #include "base/scoped_native_library.h" 26 #include "base/scoped_native_library.h"
27 #include "base/strings/string_number_conversions.h" 27 #include "base/strings/string_number_conversions.h"
28 #include "base/strings/utf_string_conversions.h" 28 #include "base/strings/utf_string_conversions.h"
29 #include "base/threading/sequenced_worker_pool.h"
30 #include "base/win/pe_image.h" 29 #include "base/win/pe_image.h"
31 #include "base/win/registry.h" 30 #include "base/win/registry.h"
32 #include "base/win/win_util.h" 31 #include "base/win/win_util.h"
33 #include "base/win/windows_version.h" 32 #include "base/win/windows_version.h"
34 #include "base/win/wrapped_window_proc.h" 33 #include "base/win/wrapped_window_proc.h"
35 #include "chrome/browser/conflicts/module_database_win.h" 34 #include "chrome/browser/conflicts/module_database_win.h"
36 #include "chrome/browser/conflicts/module_event_sink_impl_win.h" 35 #include "chrome/browser/conflicts/module_event_sink_impl_win.h"
37 #include "chrome/browser/first_run/first_run.h" 36 #include "chrome/browser/first_run/first_run.h"
38 #include "chrome/browser/install_verification/win/install_verification.h" 37 #include "chrome/browser/install_verification/win/install_verification.h"
39 #include "chrome/browser/profiles/profile_shortcut_manager.h" 38 #include "chrome/browser/profiles/profile_shortcut_manager.h"
(...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 if (resource_id) 538 if (resource_id)
540 return l10n_util::GetStringUTF16(resource_id); 539 return l10n_util::GetStringUTF16(resource_id);
541 return base::string16(); 540 return base::string16();
542 } 541 }
543 542
544 // static 543 // static
545 void ChromeBrowserMainPartsWin::SetupInstallerUtilStrings() { 544 void ChromeBrowserMainPartsWin::SetupInstallerUtilStrings() {
546 CR_DEFINE_STATIC_LOCAL(TranslationDelegate, delegate, ()); 545 CR_DEFINE_STATIC_LOCAL(TranslationDelegate, delegate, ());
547 installer::SetTranslationDelegate(&delegate); 546 installer::SetTranslationDelegate(&delegate);
548 } 547 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698