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

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

Issue 10377170: Browser Plugin: browser process side changes (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: fixed nit Created 8 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
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 #include "content/browser/renderer_host/render_view_host_impl.h" 5 #include "content/browser/renderer_host/render_view_host_impl.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 } else { 251 } else {
252 content::RenderWidgetHostViewPort::GetDefaultScreenInfo( 252 content::RenderWidgetHostViewPort::GetDefaultScreenInfo(
253 &params.screen_info); 253 &params.screen_info);
254 } 254 }
255 #else 255 #else
256 params.screen_info = 256 params.screen_info =
257 WebKit::WebScreenInfoFactory::screenInfo( 257 WebKit::WebScreenInfoFactory::screenInfo(
258 gfx::NativeViewFromId(GetNativeViewId())); 258 gfx::NativeViewFromId(GetNativeViewId()));
259 #endif 259 #endif
260 260
261 if (embedder_process_id != -1) 261 if (embedder_process_id != -1) {
262 params.embedder_channel_name = 262 params.embedder_channel_name =
263 StringPrintf("%d.r%d", GetProcess()->GetID(), embedder_process_id); 263 StringPrintf("%d.r%d", GetProcess()->GetID(), embedder_process_id);
264 }
264 265
265 params.accessibility_mode = 266 params.accessibility_mode =
266 BrowserAccessibilityState::GetInstance()->IsAccessibleBrowser() ? 267 BrowserAccessibilityState::GetInstance()->IsAccessibleBrowser() ?
267 AccessibilityModeComplete : 268 AccessibilityModeComplete :
268 AccessibilityModeOff; 269 AccessibilityModeOff;
269 270
270 #if defined(OS_WIN) 271 #if defined(OS_WIN)
271 // On Windows 8, always enable accessibility for editable text controls 272 // On Windows 8, always enable accessibility for editable text controls
272 // so we can show the virtual keyboard when one is enabled. 273 // so we can show the virtual keyboard when one is enabled.
273 if (base::win::GetVersion() >= base::win::VERSION_WIN8 && 274 if (base::win::GetVersion() >= base::win::VERSION_WIN8 &&
(...skipping 1562 matching lines...) Expand 10 before | Expand all | Expand 10 after
1836 // can cause navigations to be ignored in OnMsgNavigate. 1837 // can cause navigations to be ignored in OnMsgNavigate.
1837 is_waiting_for_beforeunload_ack_ = false; 1838 is_waiting_for_beforeunload_ack_ = false;
1838 is_waiting_for_unload_ack_ = false; 1839 is_waiting_for_unload_ack_ = false;
1839 } 1840 }
1840 1841
1841 void RenderViewHostImpl::ClearPowerSaveBlockers() { 1842 void RenderViewHostImpl::ClearPowerSaveBlockers() {
1842 STLDeleteValues(&power_save_blockers_); 1843 STLDeleteValues(&power_save_blockers_);
1843 } 1844 }
1844 1845
1845 } // namespace content 1846 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/browser_plugin/browser_plugin_host_helper.cc ('k') | content/browser/web_contents/web_contents_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698