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

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

Issue 530623002: Use qualified path for three more grit headers from ui. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ui_resources too Created 6 years, 3 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 <windows.h> 7 #include <windows.h>
8 #include <shellapi.h> 8 #include <shellapi.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 30 matching lines...) Expand all
41 #include "chrome/common/terminate_on_heap_corruption_experiment_win.h" 41 #include "chrome/common/terminate_on_heap_corruption_experiment_win.h"
42 #include "chrome/grit/chromium_strings.h" 42 #include "chrome/grit/chromium_strings.h"
43 #include "chrome/grit/generated_resources.h" 43 #include "chrome/grit/generated_resources.h"
44 #include "chrome/installer/util/browser_distribution.h" 44 #include "chrome/installer/util/browser_distribution.h"
45 #include "chrome/installer/util/helper.h" 45 #include "chrome/installer/util/helper.h"
46 #include "chrome/installer/util/install_util.h" 46 #include "chrome/installer/util/install_util.h"
47 #include "chrome/installer/util/l10n_string_util.h" 47 #include "chrome/installer/util/l10n_string_util.h"
48 #include "chrome/installer/util/shell_util.h" 48 #include "chrome/installer/util/shell_util.h"
49 #include "content/public/browser/browser_thread.h" 49 #include "content/public/browser/browser_thread.h"
50 #include "content/public/common/main_function_params.h" 50 #include "content/public/common/main_function_params.h"
51 #include "grit/app_locale_settings.h"
52 #include "installer_util_strings/installer_util_strings.h" 51 #include "installer_util_strings/installer_util_strings.h"
53 #include "ui/base/cursor/cursor_loader_win.h" 52 #include "ui/base/cursor/cursor_loader_win.h"
54 #include "ui/base/l10n/l10n_util.h" 53 #include "ui/base/l10n/l10n_util.h"
55 #include "ui/base/l10n/l10n_util_win.h" 54 #include "ui/base/l10n/l10n_util_win.h"
56 #include "ui/base/ui_base_switches.h" 55 #include "ui/base/ui_base_switches.h"
57 #include "ui/base/win/message_box_win.h" 56 #include "ui/base/win/message_box_win.h"
58 #include "ui/gfx/platform_font_win.h" 57 #include "ui/gfx/platform_font_win.h"
59 #include "ui/gfx/switches.h" 58 #include "ui/gfx/switches.h"
59 #include "ui/strings/grit/app_locale_settings.h"
60 60
61 namespace { 61 namespace {
62 62
63 typedef HRESULT (STDAPICALLTYPE* RegisterApplicationRestartProc)( 63 typedef HRESULT (STDAPICALLTYPE* RegisterApplicationRestartProc)(
64 const wchar_t* command_line, 64 const wchar_t* command_line,
65 DWORD flags); 65 DWORD flags);
66 66
67 void InitializeWindowProcExceptions() { 67 void InitializeWindowProcExceptions() {
68 // Get the breakpad pointer from chrome.exe 68 // Get the breakpad pointer from chrome.exe
69 base::win::WinProcExceptionFilter exception_filter = 69 base::win::WinProcExceptionFilter exception_filter =
(...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after
428 if (resource_id) 428 if (resource_id)
429 return l10n_util::GetStringUTF16(resource_id); 429 return l10n_util::GetStringUTF16(resource_id);
430 return base::string16(); 430 return base::string16();
431 } 431 }
432 432
433 // static 433 // static
434 void ChromeBrowserMainPartsWin::SetupInstallerUtilStrings() { 434 void ChromeBrowserMainPartsWin::SetupInstallerUtilStrings() {
435 CR_DEFINE_STATIC_LOCAL(TranslationDelegate, delegate, ()); 435 CR_DEFINE_STATIC_LOCAL(TranslationDelegate, delegate, ());
436 installer::SetTranslationDelegate(&delegate); 436 installer::SetTranslationDelegate(&delegate);
437 } 437 }
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | chrome/test/data/webui/webui_resource_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698