OLD | NEW |
---|---|
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/frame_host/interstitial_page_impl.h" | 5 #include "content/browser/frame_host/interstitial_page_impl.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 519 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
530 delegate_->OverrideRendererPrefs(&renderer_preferences_); | 530 delegate_->OverrideRendererPrefs(&renderer_preferences_); |
531 return renderer_preferences_; | 531 return renderer_preferences_; |
532 } | 532 } |
533 | 533 |
534 void InterstitialPageImpl::RenderWidgetDeleted( | 534 void InterstitialPageImpl::RenderWidgetDeleted( |
535 RenderWidgetHostImpl* render_widget_host) { | 535 RenderWidgetHostImpl* render_widget_host) { |
536 // TODO(creis): Remove this method once we verify the shutdown path is sane. | 536 // TODO(creis): Remove this method once we verify the shutdown path is sane. |
537 CHECK(!web_contents_); | 537 CHECK(!web_contents_); |
538 } | 538 } |
539 | 539 |
540 TextInputState InterstitialPageImpl::GetTextInputState() { | |
541 if (web_contents_) | |
Charlie Reis
2016/03/15 18:32:00
Style nit: Body is more than one line, so this nee
EhsanK
2016/03/15 23:51:17
Fit in one line after 'git cl format'. Thanks!
| |
542 text_input_state_ = static_cast<WebContentsImpl*>(web_contents_) | |
543 ->GetTextInputState(); | |
544 return TextInputState(); | |
Charlie Reis
2016/03/15 18:32:00
Is this a bug? Looks like we assign a value to te
EhsanK
2016/03/15 23:51:17
Definitely a bug and surprised why tests didn't fa
| |
545 } | |
546 | |
547 void InterstitialPageImpl::UpdateTextInputState(RenderWidgetHostViewBase* rwhv, | |
548 bool text_input_state_changed) { | |
549 if (web_contents_) | |
550 return static_cast<WebContentsImpl*>(web_contents_) | |
551 ->UpdateTextInputState(rwhv, text_input_state_changed); | |
552 } | |
553 | |
540 bool InterstitialPageImpl::PreHandleKeyboardEvent( | 554 bool InterstitialPageImpl::PreHandleKeyboardEvent( |
541 const NativeWebKeyboardEvent& event, | 555 const NativeWebKeyboardEvent& event, |
542 bool* is_keyboard_shortcut) { | 556 bool* is_keyboard_shortcut) { |
543 if (!enabled()) | 557 if (!enabled()) |
544 return false; | 558 return false; |
545 return render_widget_host_delegate_->PreHandleKeyboardEvent( | 559 return render_widget_host_delegate_->PreHandleKeyboardEvent( |
546 event, is_keyboard_shortcut); | 560 event, is_keyboard_shortcut); |
547 } | 561 } |
548 | 562 |
549 void InterstitialPageImpl::HandleKeyboardEvent( | 563 void InterstitialPageImpl::HandleKeyboardEvent( |
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
935 void InterstitialPageImpl::UnderlyingContentObserver::NavigationEntryCommitted( | 949 void InterstitialPageImpl::UnderlyingContentObserver::NavigationEntryCommitted( |
936 const LoadCommittedDetails& load_details) { | 950 const LoadCommittedDetails& load_details) { |
937 interstitial_->OnNavigatingAwayOrTabClosing(); | 951 interstitial_->OnNavigatingAwayOrTabClosing(); |
938 } | 952 } |
939 | 953 |
940 void InterstitialPageImpl::UnderlyingContentObserver::WebContentsDestroyed() { | 954 void InterstitialPageImpl::UnderlyingContentObserver::WebContentsDestroyed() { |
941 interstitial_->OnNavigatingAwayOrTabClosing(); | 955 interstitial_->OnNavigatingAwayOrTabClosing(); |
942 } | 956 } |
943 | 957 |
944 } // namespace content | 958 } // namespace content |
OLD | NEW |