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

Side by Side Diff: chrome/common/chrome_content_client.cc

Issue 11016016: Flapper field trial to use workerpool for sync file operations. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix group check for browser_tests. Created 8 years, 2 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) 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/common/chrome_content_client.h" 5 #include "chrome/common/chrome_content_client.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/cpu.h" 8 #include "base/cpu.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 291
292 FilePath flash_path; 292 FilePath flash_path;
293 if (!PathService::Get(chrome::FILE_PEPPER_FLASH_PLUGIN, &flash_path)) 293 if (!PathService::Get(chrome::FILE_PEPPER_FLASH_PLUGIN, &flash_path))
294 return false; 294 return false;
295 295
296 bool force_enable = CommandLine::ForCurrentProcess()->HasSwitch( 296 bool force_enable = CommandLine::ForCurrentProcess()->HasSwitch(
297 switches::kEnableBundledPpapiFlash); 297 switches::kEnableBundledPpapiFlash);
298 298
299 *plugin = CreatePepperFlashInfo(flash_path, FLAPPER_VERSION_STRING); 299 *plugin = CreatePepperFlashInfo(flash_path, FLAPPER_VERSION_STRING);
300 *override_npapi_flash = force_enable || IsPepperFlashEnabledByDefault(); 300 *override_npapi_flash = force_enable || IsPepperFlashEnabledByDefault();
301
302 // TODO(shess): http://crbug.com/153383 debugging.
yzshen1 2012/10/02 23:33:44 IIRC, at this point the field trial list hasn't be
Scott Hess - ex-Googler 2012/10/02 23:42:31 OK - would it make sense to tuck it into Conductin
yzshen1 2012/10/02 23:52:10 I guess not, because ConductingPepperFlashFieldTri
Scott Hess - ex-Googler 2012/10/03 19:38:51 Oops, sorry - I hadn't read this before just movin
yzshen1 2012/10/03 19:58:36 Yay!
303 ActivatePepperFlashThreadFieldTrial();
301 return true; 304 return true;
302 #else 305 #else
303 return false; 306 return false;
304 #endif // FLAPPER_AVAILABLE 307 #endif // FLAPPER_AVAILABLE
305 } 308 }
306 309
307 #if defined(OS_WIN) 310 #if defined(OS_WIN)
308 // Launches the privileged flash broker, used when flash is sandboxed. 311 // Launches the privileged flash broker, used when flash is sandboxed.
309 // The broker is the same flash dll, except that it uses a different 312 // The broker is the same flash dll, except that it uses a different
310 // entrypoint (BrokerMain) and it is hosted in windows' generic surrogate 313 // entrypoint (BrokerMain) and it is hosted in windows' generic surrogate
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
541 544
542 bool ChromeContentClient::GetBundledFieldTrialPepperFlash( 545 bool ChromeContentClient::GetBundledFieldTrialPepperFlash(
543 content::PepperPluginInfo* plugin, 546 content::PepperPluginInfo* plugin,
544 bool* override_npapi_flash) { 547 bool* override_npapi_flash) {
545 if (!ConductingPepperFlashFieldTrial()) 548 if (!ConductingPepperFlashFieldTrial())
546 return false; 549 return false;
547 return GetBundledPepperFlash(plugin, override_npapi_flash); 550 return GetBundledPepperFlash(plugin, override_npapi_flash);
548 } 551 }
549 552
550 } // namespace chrome 553 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/common/pepper_flash.h » ('j') | content/browser/renderer_host/pepper/pepper_file_message_filter.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698