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

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

Issue 6551019: Trace_event upgrades (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More gooder js thanks to arv. Created 9 years, 10 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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> 5 #include <windows.h>
6 #include <shlwapi.h> 6 #include <shlwapi.h>
7 7
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "base/environment.h" 10 #include "base/environment.h"
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 RegQueryValueEx(key, L"PreReadSize", NULL, NULL, 138 RegQueryValueEx(key, L"PreReadSize", NULL, NULL,
139 reinterpret_cast<LPBYTE>(&pre_read_size), &unused); 139 reinterpret_cast<LPBYTE>(&pre_read_size), &unused);
140 RegQueryValueEx(key, L"PreReadStepSize", NULL, NULL, 140 RegQueryValueEx(key, L"PreReadStepSize", NULL, NULL,
141 reinterpret_cast<LPBYTE>(&pre_read_step_size), &unused); 141 reinterpret_cast<LPBYTE>(&pre_read_step_size), &unused);
142 RegQueryValueEx(key, L"PreRead", NULL, NULL, 142 RegQueryValueEx(key, L"PreRead", NULL, NULL,
143 reinterpret_cast<LPBYTE>(&pre_read), &unused); 143 reinterpret_cast<LPBYTE>(&pre_read), &unused);
144 RegCloseKey(key); 144 RegCloseKey(key);
145 key = NULL; 145 key = NULL;
146 } 146 }
147 if (pre_read) { 147 if (pre_read) {
148 TRACE_EVENT_BEGIN("PreReadImage", 0, ""); 148 TRACE_EVENT_BEGIN_LEGACY("PreReadImage", 0, "");
149 file_util::PreReadImage(dir->c_str(), pre_read_size, pre_read_step_size); 149 file_util::PreReadImage(dir->c_str(), pre_read_size, pre_read_step_size);
150 TRACE_EVENT_END("PreReadImage", 0, ""); 150 TRACE_EVENT_END_LEGACY("PreReadImage", 0, "");
151 } 151 }
152 } 152 }
153 #endif // NDEBUG 153 #endif // NDEBUG
154 154
155 return ::LoadLibraryExW(dir->c_str(), NULL, 155 return ::LoadLibraryExW(dir->c_str(), NULL,
156 LOAD_WITH_ALTERED_SEARCH_PATH); 156 LOAD_WITH_ALTERED_SEARCH_PATH);
157 } 157 }
158 158
159 // Set did_run "dr" in omaha's client state for this product. 159 // Set did_run "dr" in omaha's client state for this product.
160 bool SetDidRunState(const wchar_t* guid, const wchar_t* value) { 160 bool SetDidRunState(const wchar_t* guid, const wchar_t* value) {
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 } 332 }
333 }; 333 };
334 334
335 MainDllLoader* MakeMainDllLoader() { 335 MainDllLoader* MakeMainDllLoader() {
336 #if defined(GOOGLE_CHROME_BUILD) 336 #if defined(GOOGLE_CHROME_BUILD)
337 return new ChromeDllLoader(); 337 return new ChromeDllLoader();
338 #else 338 #else
339 return new ChromiumDllLoader(); 339 return new ChromiumDllLoader();
340 #endif 340 #endif
341 } 341 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698