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

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

Issue 1062743006: Add installer_util_unittests to the GN windows build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@wintests3
Patch Set: Fixes Created 5 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
« no previous file with comments | « chrome/app_installer/BUILD.gn ('k') | chrome/chrome.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <windows.h> 7 #include <windows.h>
8 #include <shellapi.h> 8 #include <shellapi.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 #include "chrome/common/chrome_result_codes.h" 43 #include "chrome/common/chrome_result_codes.h"
44 #include "chrome/common/chrome_switches.h" 44 #include "chrome/common/chrome_switches.h"
45 #include "chrome/common/chrome_utility_messages.h" 45 #include "chrome/common/chrome_utility_messages.h"
46 #include "chrome/common/chrome_version_info.h" 46 #include "chrome/common/chrome_version_info.h"
47 #include "chrome/common/env_vars.h" 47 #include "chrome/common/env_vars.h"
48 #include "chrome/grit/chromium_strings.h" 48 #include "chrome/grit/chromium_strings.h"
49 #include "chrome/grit/generated_resources.h" 49 #include "chrome/grit/generated_resources.h"
50 #include "chrome/installer/util/browser_distribution.h" 50 #include "chrome/installer/util/browser_distribution.h"
51 #include "chrome/installer/util/helper.h" 51 #include "chrome/installer/util/helper.h"
52 #include "chrome/installer/util/install_util.h" 52 #include "chrome/installer/util/install_util.h"
53 #include "chrome/installer/util/installer_util_strings.h"
53 #include "chrome/installer/util/l10n_string_util.h" 54 #include "chrome/installer/util/l10n_string_util.h"
54 #include "chrome/installer/util/shell_util.h" 55 #include "chrome/installer/util/shell_util.h"
55 #include "content/public/browser/browser_thread.h" 56 #include "content/public/browser/browser_thread.h"
56 #include "content/public/browser/utility_process_host.h" 57 #include "content/public/browser/utility_process_host.h"
57 #include "content/public/browser/utility_process_host_client.h" 58 #include "content/public/browser/utility_process_host_client.h"
58 #include "content/public/common/content_switches.h" 59 #include "content/public/common/content_switches.h"
59 #include "content/public/common/dwrite_font_platform_win.h" 60 #include "content/public/common/dwrite_font_platform_win.h"
60 #include "content/public/common/main_function_params.h" 61 #include "content/public/common/main_function_params.h"
61 #include "installer_util_strings/installer_util_strings.h"
62 #include "ui/base/cursor/cursor_loader_win.h" 62 #include "ui/base/cursor/cursor_loader_win.h"
63 #include "ui/base/l10n/l10n_util.h" 63 #include "ui/base/l10n/l10n_util.h"
64 #include "ui/base/l10n/l10n_util_win.h" 64 #include "ui/base/l10n/l10n_util_win.h"
65 #include "ui/base/ui_base_switches.h" 65 #include "ui/base/ui_base_switches.h"
66 #include "ui/base/win/message_box_win.h" 66 #include "ui/base/win/message_box_win.h"
67 #include "ui/gfx/platform_font_win.h" 67 #include "ui/gfx/platform_font_win.h"
68 #include "ui/gfx/switches.h" 68 #include "ui/gfx/switches.h"
69 #include "ui/gfx/win/direct_write.h" 69 #include "ui/gfx/win/direct_write.h"
70 #include "ui/strings/grit/app_locale_settings.h" 70 #include "ui/strings/grit/app_locale_settings.h"
71 71
(...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after
524 if (resource_id) 524 if (resource_id)
525 return l10n_util::GetStringUTF16(resource_id); 525 return l10n_util::GetStringUTF16(resource_id);
526 return base::string16(); 526 return base::string16();
527 } 527 }
528 528
529 // static 529 // static
530 void ChromeBrowserMainPartsWin::SetupInstallerUtilStrings() { 530 void ChromeBrowserMainPartsWin::SetupInstallerUtilStrings() {
531 CR_DEFINE_STATIC_LOCAL(TranslationDelegate, delegate, ()); 531 CR_DEFINE_STATIC_LOCAL(TranslationDelegate, delegate, ());
532 installer::SetTranslationDelegate(&delegate); 532 installer::SetTranslationDelegate(&delegate);
533 } 533 }
OLDNEW
« no previous file with comments | « chrome/app_installer/BUILD.gn ('k') | chrome/chrome.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698