Chromium Code Reviews| Index: chrome/browser/chrome_content_browser_client.cc |
| =================================================================== |
| --- chrome/browser/chrome_content_browser_client.cc (revision 101031) |
| +++ chrome/browser/chrome_content_browser_client.cc (working copy) |
| @@ -10,6 +10,7 @@ |
| #include "chrome/browser/browser_process.h" |
| #include "chrome/browser/browsing_data_remover.h" |
| #include "chrome/browser/character_encoding.h" |
| +#include "chrome/browser/chrome_benchmarking_message_filter.h" |
| #include "chrome/browser/chrome_plugin_message_filter.h" |
| #include "chrome/browser/chrome_quota_permission_context.h" |
| #include "chrome/browser/chrome_worker_message_filter.h" |
| @@ -168,6 +169,8 @@ |
| host->channel()->AddFilter( |
| new SearchProviderInstallStateMessageFilter(id, profile)); |
| host->channel()->AddFilter(new SpellCheckMessageFilter(id)); |
| + host->channel()->AddFilter(new ChromeBenchmarkingMessageFilter( |
| + id, profile, profile->GetRequestContextForRenderProcess(id))); |
| host->Send(new ChromeViewMsg_SetIsIncognitoProcess( |
| profile->IsOffTheRecord())); |
| @@ -332,6 +335,7 @@ |
| switches::kProfilingFile, |
| switches::kProfilingFlush, |
| switches::kSilentDumpOnDCHECK, |
| + switches::kEnableBenchmarking, |
| }; |
| command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, |
| @@ -365,6 +369,13 @@ |
| command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, |
| arraysize(kSwitchNames)); |
| } |
| + |
| + // The command line switch kEnableBenchmarking needs to be specified along |
| + // with the kEnableStatsTable switch to ensure that the stats table global |
| + // is initialized correctly. |
| + if (command_line->HasSwitch(switches::kEnableBenchmarking)) { |
|
jam
2011/09/14 23:47:35
nit: this file doesn't use brackets for one line s
|
| + DCHECK(command_line->HasSwitch(switches::kEnableStatsTable)); |
| + } |
| } |
| std::string ChromeContentBrowserClient::GetApplicationLocale() { |