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

Side by Side Diff: content/browser/renderer_host/render_process_host_impl.cc

Issue 294863002: Cleanup changes related to replacing usage of GetImageScale with GetScaleForScaleFactor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removing changes to enable high dpi by default from this patch Created 6 years, 7 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
« no previous file with comments | « components/favicon_base/select_favicon_frames.cc ('k') | ui/base/layout.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 // 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 1180 matching lines...) Expand 10 before | Expand all | Expand 10 after
1191 switches::kNetworkCountryIso, 1191 switches::kNetworkCountryIso,
1192 switches::kDisableWebAudio, 1192 switches::kDisableWebAudio,
1193 #endif 1193 #endif
1194 #if defined(OS_MACOSX) 1194 #if defined(OS_MACOSX)
1195 // Allow this to be set when invoking the browser and relayed along. 1195 // Allow this to be set when invoking the browser and relayed along.
1196 switches::kEnableSandboxLogging, 1196 switches::kEnableSandboxLogging,
1197 #endif 1197 #endif
1198 #if defined(OS_WIN) 1198 #if defined(OS_WIN)
1199 switches::kEnableDirectWrite, 1199 switches::kEnableDirectWrite,
1200 switches::kEnableHighResolutionTime, 1200 switches::kEnableHighResolutionTime,
1201 switches::kHighDPISupport,
1202 #endif 1201 #endif
1203 }; 1202 };
1204 renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames, 1203 renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames,
1205 arraysize(kSwitchNames)); 1204 arraysize(kSwitchNames));
1206 1205
1207 if (browser_cmd.HasSwitch(switches::kTraceStartup) && 1206 if (browser_cmd.HasSwitch(switches::kTraceStartup) &&
1208 BrowserMainLoop::GetInstance()->is_tracing_startup()) { 1207 BrowserMainLoop::GetInstance()->is_tracing_startup()) {
1209 // Pass kTraceStartup switch to renderer only if startup tracing has not 1208 // Pass kTraceStartup switch to renderer only if startup tracing has not
1210 // finished. 1209 // finished.
1211 renderer_cmd->AppendSwitchASCII( 1210 renderer_cmd->AppendSwitchASCII(
(...skipping 862 matching lines...) Expand 10 before | Expand all | Expand 10 after
2074 mojo::ScopedMessagePipeHandle handle) { 2073 mojo::ScopedMessagePipeHandle handle) {
2075 mojo_activation_required_ = true; 2074 mojo_activation_required_ = true;
2076 MaybeActivateMojo(); 2075 MaybeActivateMojo();
2077 2076
2078 mojo::AllocationScope scope; 2077 mojo::AllocationScope scope;
2079 mojo_application_host_->shell_client()->AcceptConnection(service_name, 2078 mojo_application_host_->shell_client()->AcceptConnection(service_name,
2080 handle.Pass()); 2079 handle.Pass());
2081 } 2080 }
2082 2081
2083 } // namespace content 2082 } // namespace content
OLDNEW
« no previous file with comments | « components/favicon_base/select_favicon_frames.cc ('k') | ui/base/layout.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698