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

Side by Side 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: 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 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 <windows.h> // NOLINT 5 #include <windows.h> // NOLINT
6 #include <shlwapi.h> // NOLINT 6 #include <shlwapi.h> // NOLINT
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <userenv.h> // NOLINT 8 #include <userenv.h> // NOLINT
9 9
10 #include "chrome/app/main_dll_loader_win.h" 10 #include "chrome/app/main_dll_loader_win.h"
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 !InstallUtil::IsPerUserInstall(cmd_line.GetProgram())); 242 !InstallUtil::IsPerUserInstall(cmd_line.GetProgram()));
243 243
244 // Intentionally leaked. 244 // Intentionally leaked.
245 HMODULE watcher_dll = Load(&version, &file); 245 HMODULE watcher_dll = Load(&version, &file);
246 if (!watcher_dll) 246 if (!watcher_dll)
247 return chrome::RESULT_CODE_MISSING_DATA; 247 return chrome::RESULT_CODE_MISSING_DATA;
248 248
249 ChromeWatcherMainFunction watcher_main = 249 ChromeWatcherMainFunction watcher_main =
250 reinterpret_cast<ChromeWatcherMainFunction>( 250 reinterpret_cast<ChromeWatcherMainFunction>(
251 ::GetProcAddress(watcher_dll, kChromeWatcherDLLEntrypoint)); 251 ::GetProcAddress(watcher_dll, kChromeWatcherDLLEntrypoint));
252 return watcher_main(chrome::kBrowserExitCodesRegistryPath, 252 return watcher_main(chrome::GetBrowserExitCodesRegistryPath(),
253 parent_process.Take(), main_thread_id, 253 parent_process.Take(), main_thread_id,
254 on_initialized_event.Take(), 254 on_initialized_event.Take(),
255 watcher_data_directory.value().c_str(), 255 watcher_data_directory.value().c_str(),
256 message_window_name.c_str(), channel_name.c_str()); 256 message_window_name.c_str(), channel_name.c_str());
257 } 257 }
258 258
259 // Initialize the sandbox services. 259 // Initialize the sandbox services.
260 sandbox::SandboxInterfaceInfo sandbox_info = {0}; 260 sandbox::SandboxInterfaceInfo sandbox_info = {0};
261 content::InitializeSandboxInfo(&sandbox_info); 261 content::InitializeSandboxInfo(&sandbox_info);
262 262
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 } 386 }
387 }; 387 };
388 388
389 MainDllLoader* MakeMainDllLoader() { 389 MainDllLoader* MakeMainDllLoader() {
390 #if defined(GOOGLE_CHROME_BUILD) 390 #if defined(GOOGLE_CHROME_BUILD)
391 return new ChromeDllLoader(); 391 return new ChromeDllLoader();
392 #else 392 #else
393 return new ChromiumDllLoader(); 393 return new ChromiumDllLoader();
394 #endif 394 #endif
395 } 395 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698