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 #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 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
248 } else { | 248 } else { |
249 content::RenderWidgetHostViewPort::GetDefaultScreenInfo( | 249 content::RenderWidgetHostViewPort::GetDefaultScreenInfo( |
250 ¶ms.screen_info); | 250 ¶ms.screen_info); |
251 } | 251 } |
252 #else | 252 #else |
253 params.screen_info = | 253 params.screen_info = |
254 WebKit::WebScreenInfoFactory::screenInfo( | 254 WebKit::WebScreenInfoFactory::screenInfo( |
255 gfx::NativeViewFromId(GetNativeViewId())); | 255 gfx::NativeViewFromId(GetNativeViewId())); |
256 #endif | 256 #endif |
257 | 257 |
258 if (embedder_process_id != -1) | 258 if (embedder_process_id != -1) { |
259 params.embedder_channel_name = | 259 params.embedder_channel_name = |
260 StringPrintf("%d.r%d", GetProcess()->GetID(), embedder_process_id); | 260 StringPrintf("%d.r%d", GetProcess()->GetID(), embedder_process_id); |
| 261 } |
261 | 262 |
262 params.accessibility_mode = | 263 params.accessibility_mode = |
263 BrowserAccessibilityState::GetInstance()->IsAccessibleBrowser() ? | 264 BrowserAccessibilityState::GetInstance()->IsAccessibleBrowser() ? |
264 AccessibilityModeComplete : | 265 AccessibilityModeComplete : |
265 AccessibilityModeOff; | 266 AccessibilityModeOff; |
266 | 267 |
267 #if defined(OS_WIN) | 268 #if defined(OS_WIN) |
268 // On Windows 8, always enable accessibility for editable text controls | 269 // On Windows 8, always enable accessibility for editable text controls |
269 // so we can show the virtual keyboard when one is enabled. | 270 // so we can show the virtual keyboard when one is enabled. |
270 if (base::win::GetVersion() >= base::win::VERSION_WIN8 && | 271 if (base::win::GetVersion() >= base::win::VERSION_WIN8 && |
(...skipping 1565 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 |
OLD | NEW |