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

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

Issue 659883002: Enable hidpi on Linux, refactor a bit on Windows to share Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: resource bundle loading Created 6 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
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 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 152
153 #if defined(OS_ANDROID) 153 #if defined(OS_ANDROID)
154 #include "content/browser/media/android/browser_demuxer_android.h" 154 #include "content/browser/media/android/browser_demuxer_android.h"
155 #include "content/browser/screen_orientation/screen_orientation_message_filter_a ndroid.h" 155 #include "content/browser/screen_orientation/screen_orientation_message_filter_a ndroid.h"
156 #endif 156 #endif
157 157
158 #if defined(OS_WIN) 158 #if defined(OS_WIN)
159 #include "base/win/scoped_com_initializer.h" 159 #include "base/win/scoped_com_initializer.h"
160 #include "content/common/font_cache_dispatcher_win.h" 160 #include "content/common/font_cache_dispatcher_win.h"
161 #include "content/common/sandbox_win.h" 161 #include "content/common/sandbox_win.h"
162 #include "ui/gfx/win/dpi.h" 162 #include "ui/gfx/dpi.h"
163 #endif 163 #endif
164 164
165 #if defined(ENABLE_BROWSER_CDMS) 165 #if defined(ENABLE_BROWSER_CDMS)
166 #include "content/browser/media/cdm/browser_cdm_manager.h" 166 #include "content/browser/media/cdm/browser_cdm_manager.h"
167 #endif 167 #endif
168 168
169 #if defined(ENABLE_PLUGINS) 169 #if defined(ENABLE_PLUGINS)
170 #include "content/browser/plugin_service_impl.h" 170 #include "content/browser/plugin_service_impl.h"
171 #endif 171 #endif
172 172
(...skipping 2079 matching lines...) Expand 10 before | Expand all | Expand 10 after
2252 if (worker_ref_count_ == 0) 2252 if (worker_ref_count_ == 0)
2253 Cleanup(); 2253 Cleanup();
2254 } 2254 }
2255 2255
2256 void RenderProcessHostImpl::EnsureMojoActivated() { 2256 void RenderProcessHostImpl::EnsureMojoActivated() {
2257 mojo_activation_required_ = true; 2257 mojo_activation_required_ = true;
2258 MaybeActivateMojo(); 2258 MaybeActivateMojo();
2259 } 2259 }
2260 2260
2261 } // namespace content 2261 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698