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

Side by Side Diff: chrome/app/main_dll_loader_win.cc

Issue 1591663003: Move pre_read_field_trial_utils.h/cc to common/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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 29 matching lines...) Expand all
40 #include "chrome/common/chrome_switches.h" 40 #include "chrome/common/chrome_switches.h"
41 #include "chrome/common/env_vars.h" 41 #include "chrome/common/env_vars.h"
42 #include "chrome/installer/util/browser_distribution.h" 42 #include "chrome/installer/util/browser_distribution.h"
43 #include "chrome/installer/util/google_update_constants.h" 43 #include "chrome/installer/util/google_update_constants.h"
44 #include "chrome/installer/util/google_update_settings.h" 44 #include "chrome/installer/util/google_update_settings.h"
45 #include "chrome/installer/util/install_util.h" 45 #include "chrome/installer/util/install_util.h"
46 #include "chrome/installer/util/module_util_win.h" 46 #include "chrome/installer/util/module_util_win.h"
47 #include "chrome/installer/util/util_constants.h" 47 #include "chrome/installer/util/util_constants.h"
48 #include "components/crash/content/app/crash_reporter_client.h" 48 #include "components/crash/content/app/crash_reporter_client.h"
49 #include "components/crash/content/app/crashpad.h" 49 #include "components/crash/content/app/crashpad.h"
50 #include "components/startup_metric_utils/browser/pre_read_field_trial_utils_win .h" 50 #include "components/startup_metric_utils/common/pre_read_field_trial_utils_win. h"
51 #include "content/public/app/sandbox_helper_win.h" 51 #include "content/public/app/sandbox_helper_win.h"
52 #include "content/public/common/content_switches.h" 52 #include "content/public/common/content_switches.h"
53 #include "sandbox/win/src/sandbox.h" 53 #include "sandbox/win/src/sandbox.h"
54 54
55 namespace { 55 namespace {
56 // The entry point signature of chrome.dll. 56 // The entry point signature of chrome.dll.
57 typedef int (*DLL_MAIN)(HINSTANCE, sandbox::SandboxInterfaceInfo*); 57 typedef int (*DLL_MAIN)(HINSTANCE, sandbox::SandboxInterfaceInfo*);
58 58
59 typedef void (*RelaunchChromeBrowserWithNewCommandLineIfNeededFunc)(); 59 typedef void (*RelaunchChromeBrowserWithNewCommandLineIfNeededFunc)();
60 60
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 } 390 }
391 }; 391 };
392 392
393 MainDllLoader* MakeMainDllLoader() { 393 MainDllLoader* MakeMainDllLoader() {
394 #if defined(GOOGLE_CHROME_BUILD) 394 #if defined(GOOGLE_CHROME_BUILD)
395 return new ChromeDllLoader(); 395 return new ChromeDllLoader();
396 #else 396 #else
397 return new ChromiumDllLoader(); 397 return new ChromiumDllLoader();
398 #endif 398 #endif
399 } 399 }
OLDNEW
« chrome/app/DEPS ('K') | « chrome/app/DEPS ('k') | chrome/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698