Chromium Code Reviews| 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/web_contents/web_contents_impl.h" | 5 #include "content/browser/web_contents/web_contents_impl.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <cmath> | 9 #include <cmath> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 2365 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2376 | 2376 |
| 2377 void WebContentsImpl::SetIsVirtualKeyboardRequested(bool requested) { | 2377 void WebContentsImpl::SetIsVirtualKeyboardRequested(bool requested) { |
| 2378 virtual_keyboard_requested_ = requested; | 2378 virtual_keyboard_requested_ = requested; |
| 2379 } | 2379 } |
| 2380 | 2380 |
| 2381 bool WebContentsImpl::IsVirtualKeyboardRequested() { | 2381 bool WebContentsImpl::IsVirtualKeyboardRequested() { |
| 2382 return virtual_keyboard_requested_; | 2382 return virtual_keyboard_requested_; |
| 2383 } | 2383 } |
| 2384 | 2384 |
| 2385 bool WebContentsImpl::IsOverridingUserAgent() { | 2385 bool WebContentsImpl::IsOverridingUserAgent() { |
| 2386 return GetController().GetVisibleEntry() && | 2386 return GetController().GetActiveEntry() && |
|
nasko
2017/01/10 17:33:35
This is not an ok change, since GetActiveEntry is
aelias_OOO_until_Jul13
2017/01/10 21:31:15
OK then, I reuploaded patch set 1.
| |
| 2387 GetController().GetVisibleEntry()->GetIsOverridingUserAgent(); | 2387 GetController().GetActiveEntry()->GetIsOverridingUserAgent(); |
| 2388 } | 2388 } |
| 2389 | 2389 |
| 2390 bool WebContentsImpl::IsJavaScriptDialogShowing() const { | 2390 bool WebContentsImpl::IsJavaScriptDialogShowing() const { |
| 2391 return is_showing_javascript_dialog_; | 2391 return is_showing_javascript_dialog_; |
| 2392 } | 2392 } |
| 2393 | 2393 |
| 2394 AccessibilityMode WebContentsImpl::GetAccessibilityMode() const { | 2394 AccessibilityMode WebContentsImpl::GetAccessibilityMode() const { |
| 2395 return accessibility_mode_; | 2395 return accessibility_mode_; |
| 2396 } | 2396 } |
| 2397 | 2397 |
| (...skipping 3020 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 5418 GetMainFrame()->AddMessageToConsole( | 5418 GetMainFrame()->AddMessageToConsole( |
| 5419 content::CONSOLE_MESSAGE_LEVEL_WARNING, | 5419 content::CONSOLE_MESSAGE_LEVEL_WARNING, |
| 5420 base::StringPrintf("This site does not have a valid SSL " | 5420 base::StringPrintf("This site does not have a valid SSL " |
| 5421 "certificate! Without SSL, your site's and " | 5421 "certificate! Without SSL, your site's and " |
| 5422 "visitors' data is vulnerable to theft and " | 5422 "visitors' data is vulnerable to theft and " |
| 5423 "tampering. Get a valid SSL certificate before" | 5423 "tampering. Get a valid SSL certificate before" |
| 5424 " releasing your website to the public.")); | 5424 " releasing your website to the public.")); |
| 5425 } | 5425 } |
| 5426 | 5426 |
| 5427 } // namespace content | 5427 } // namespace content |
| OLD | NEW |