OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
192 #include "ipc/ipc_sync_channel.h" | 192 #include "ipc/ipc_sync_channel.h" |
193 #endif | 193 #endif |
194 | 194 |
195 #if defined(OS_WIN) | 195 #if defined(OS_WIN) |
196 #include "base/win/scoped_com_initializer.h" | 196 #include "base/win/scoped_com_initializer.h" |
197 #include "base/win/windows_version.h" | 197 #include "base/win/windows_version.h" |
198 #include "content/browser/renderer_host/dwrite_font_proxy_message_filter_win.h" | 198 #include "content/browser/renderer_host/dwrite_font_proxy_message_filter_win.h" |
199 #include "content/common/font_cache_dispatcher_win.h" | 199 #include "content/common/font_cache_dispatcher_win.h" |
200 #include "content/common/sandbox_win.h" | 200 #include "content/common/sandbox_win.h" |
201 #include "sandbox/win/src/sandbox_policy.h" | 201 #include "sandbox/win/src/sandbox_policy.h" |
202 #include "ui/gfx/win/dpi.h" | 202 #include "ui/display/win/dpi.h" |
203 #endif | 203 #endif |
204 | 204 |
205 #if defined(OS_MACOSX) | 205 #if defined(OS_MACOSX) |
206 #include "content/browser/bootstrap_sandbox_manager_mac.h" | 206 #include "content/browser/bootstrap_sandbox_manager_mac.h" |
207 #include "content/browser/mach_broker_mac.h" | 207 #include "content/browser/mach_broker_mac.h" |
208 #endif | 208 #endif |
209 | 209 |
210 #if defined(OS_POSIX) | 210 #if defined(OS_POSIX) |
211 #include "content/browser/zygote_host/zygote_communication_linux.h" | 211 #include "content/browser/zygote_host/zygote_communication_linux.h" |
212 #include "content/browser/zygote_host/zygote_host_impl_linux.h" | 212 #include "content/browser/zygote_host/zygote_host_impl_linux.h" |
(...skipping 1160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1373 field_trial_states); | 1373 field_trial_states); |
1374 } | 1374 } |
1375 | 1375 |
1376 GetContentClient()->browser()->AppendExtraCommandLineSwitches(command_line, | 1376 GetContentClient()->browser()->AppendExtraCommandLineSwitches(command_line, |
1377 GetID()); | 1377 GetID()); |
1378 | 1378 |
1379 if (IsPinchToZoomEnabled()) | 1379 if (IsPinchToZoomEnabled()) |
1380 command_line->AppendSwitch(switches::kEnablePinch); | 1380 command_line->AppendSwitch(switches::kEnablePinch); |
1381 | 1381 |
1382 #if defined(OS_WIN) | 1382 #if defined(OS_WIN) |
1383 command_line->AppendSwitchASCII(switches::kDeviceScaleFactor, | 1383 command_line->AppendSwitchASCII( |
1384 base::DoubleToString(gfx::GetDPIScale())); | 1384 switches::kDeviceScaleFactor, |
| 1385 base::DoubleToString(display::win::GetDPIScale())); |
1385 #endif | 1386 #endif |
1386 | 1387 |
1387 AppendCompositorCommandLineFlags(command_line); | 1388 AppendCompositorCommandLineFlags(command_line); |
1388 | 1389 |
1389 if (!mojo_channel_token_.empty()) { | 1390 if (!mojo_channel_token_.empty()) { |
1390 command_line->AppendSwitchASCII(switches::kMojoChannelToken, | 1391 command_line->AppendSwitchASCII(switches::kMojoChannelToken, |
1391 mojo_channel_token_); | 1392 mojo_channel_token_); |
1392 } | 1393 } |
1393 } | 1394 } |
1394 | 1395 |
(...skipping 1447 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2842 | 2843 |
2843 // Skip widgets in other processes. | 2844 // Skip widgets in other processes. |
2844 if (rvh->GetProcess()->GetID() != GetID()) | 2845 if (rvh->GetProcess()->GetID() != GetID()) |
2845 continue; | 2846 continue; |
2846 | 2847 |
2847 rvh->OnWebkitPreferencesChanged(); | 2848 rvh->OnWebkitPreferencesChanged(); |
2848 } | 2849 } |
2849 } | 2850 } |
2850 | 2851 |
2851 } // namespace content | 2852 } // namespace content |
OLD | NEW |