| OLD | NEW | 
|---|
| 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 // Represents the browser side of the browser <--> renderer communication | 5 // Represents the browser side of the browser <--> renderer communication | 
| 6 // channel. There will be one RenderProcessHost per renderer process. | 6 // channel. There will be one RenderProcessHost per renderer process. | 
| 7 | 7 | 
| 8 #include "content/browser/renderer_host/render_process_host_impl.h" | 8 #include "content/browser/renderer_host/render_process_host_impl.h" | 
| 9 | 9 | 
| 10 #include <algorithm> | 10 #include <algorithm> | 
| (...skipping 1115 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1126     switches::kNetworkCountryIso, | 1126     switches::kNetworkCountryIso, | 
| 1127 #endif | 1127 #endif | 
| 1128 #if defined(OS_MACOSX) | 1128 #if defined(OS_MACOSX) | 
| 1129     // Allow this to be set when invoking the browser and relayed along. | 1129     // Allow this to be set when invoking the browser and relayed along. | 
| 1130     switches::kEnableSandboxLogging, | 1130     switches::kEnableSandboxLogging, | 
| 1131 #endif | 1131 #endif | 
| 1132 #if defined(OS_POSIX) | 1132 #if defined(OS_POSIX) | 
| 1133     switches::kChildCleanExit, | 1133     switches::kChildCleanExit, | 
| 1134 #endif | 1134 #endif | 
| 1135 #if defined(OS_WIN) | 1135 #if defined(OS_WIN) | 
|  | 1136     switches::kEnableDirectWrite, | 
| 1136     switches::kEnableHighResolutionTime, | 1137     switches::kEnableHighResolutionTime, | 
| 1137 #endif | 1138 #endif | 
| 1138   }; | 1139   }; | 
| 1139   renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames, | 1140   renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames, | 
| 1140                                  arraysize(kSwitchNames)); | 1141                                  arraysize(kSwitchNames)); | 
| 1141 | 1142 | 
| 1142   if (browser_cmd.HasSwitch(switches::kTraceStartup) && | 1143   if (browser_cmd.HasSwitch(switches::kTraceStartup) && | 
| 1143       BrowserMainLoop::GetInstance()->is_tracing_startup()) { | 1144       BrowserMainLoop::GetInstance()->is_tracing_startup()) { | 
| 1144     // Pass kTraceStartup switch to renderer only if startup tracing has not | 1145     // Pass kTraceStartup switch to renderer only if startup tracing has not | 
| 1145     // finished. | 1146     // finished. | 
| (...skipping 751 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1897     // Skip widgets in other processes. | 1898     // Skip widgets in other processes. | 
| 1898     if (widget->GetProcess()->GetID() != GetID()) | 1899     if (widget->GetProcess()->GetID() != GetID()) | 
| 1899       continue; | 1900       continue; | 
| 1900 | 1901 | 
| 1901     RenderViewHost* rvh = RenderViewHost::From(widget); | 1902     RenderViewHost* rvh = RenderViewHost::From(widget); | 
| 1902     rvh->UpdateWebkitPreferences(rvh->GetWebkitPreferences()); | 1903     rvh->UpdateWebkitPreferences(rvh->GetWebkitPreferences()); | 
| 1903   } | 1904   } | 
| 1904 } | 1905 } | 
| 1905 | 1906 | 
| 1906 }  // namespace content | 1907 }  // namespace content | 
| OLD | NEW | 
|---|