chrome/app/main_dll_loader_win.cc - Issue 1630923002: Remove PRODUCT_STRING_PATH from chrome_constants.h on Windows.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/app/main_dll_loader_win.cc

Issue 1630923002: Remove PRODUCT_STRING_PATH from chrome_constants.h on Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@c2_rm_PSP_profile_resetter

Patch Set: rebase on r373339 and rm unused install_util.h include Created 4 years, 11 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/app/chrome_crash_reporter_client.cc ('k') | chrome/browser/metrics/chrome_metrics_service_client.cc » ('j') | chrome/common/chrome_constants_util_win.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/app/main_dll_loader_win.cc

diff --git a/chrome/app/main_dll_loader_win.cc b/chrome/app/main_dll_loader_win.cc

index 4794fba522b78ac751e82634f3cc840fff5dd959..54a0c2e344892b3fe08ac456c5a0a7cf96ab21d0 100644

--- a/chrome/app/main_dll_loader_win.cc

+++ b/chrome/app/main_dll_loader_win.cc

@@ -35,6 +35,7 @@

#include "chrome/app/kasko_client.h"

#include "chrome/chrome_watcher/chrome_watcher_main_api.h"

#include "chrome/common/chrome_constants.h"

+#include "chrome/common/chrome_constants_util_win.h"

#include "chrome/common/chrome_paths.h"

#include "chrome/common/chrome_result_codes.h"

#include "chrome/common/chrome_switches.h"

@@ -227,7 +228,7 @@ int MainDllLoader::Launch(HINSTANCE instance) {

reinterpret_cast<ChromeWatcherMainFunction>(

::GetProcAddress(watcher_dll, kChromeWatcherDLLEntrypoint));

return watcher_main(

- chrome::kBrowserExitCodesRegistryPath, parent_process.Take(),

+ chrome::GetBrowserExitCodesRegistryPath(), parent_process.Take(),

main_thread_id, on_initialized_event.Take(),

watcher_data_directory.value().c_str(), channel_name.c_str());

}