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

Side by Side Diff: content/browser/frame_host/interstitial_page_impl.cc

Issue 273423004: Migrate accessibility from RenderView to RenderFrame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix more compile errors Created 6 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 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 <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after
431 if (!new_navigation_ && !should_revert_web_contents_title_) { 431 if (!new_navigation_ && !should_revert_web_contents_title_) {
432 original_web_contents_title_ = entry->GetTitle(); 432 original_web_contents_title_ = entry->GetTitle();
433 should_revert_web_contents_title_ = true; 433 should_revert_web_contents_title_ = true;
434 } 434 }
435 // TODO(evan): make use of title_direction. 435 // TODO(evan): make use of title_direction.
436 // http://code.google.com/p/chromium/issues/detail?id=27094 436 // http://code.google.com/p/chromium/issues/detail?id=27094
437 entry->SetTitle(title); 437 entry->SetTitle(title);
438 controller_->delegate()->NotifyNavigationStateChanged(INVALIDATE_TYPE_TITLE); 438 controller_->delegate()->NotifyNavigationStateChanged(INVALIDATE_TYPE_TITLE);
439 } 439 }
440 440
441 AccessibilityMode InterstitialPageImpl::GetAccessibilityMode() const {
442 if (web_contents_)
443 return static_cast<WebContentsImpl*>(web_contents_)->GetAccessibilityMode();
444 else
445 return AccessibilityModeOff;
446 }
447
441 RenderViewHostDelegateView* InterstitialPageImpl::GetDelegateView() { 448 RenderViewHostDelegateView* InterstitialPageImpl::GetDelegateView() {
442 return rvh_delegate_view_.get(); 449 return rvh_delegate_view_.get();
443 } 450 }
444 451
445 const GURL& InterstitialPageImpl::GetMainFrameLastCommittedURL() const { 452 const GURL& InterstitialPageImpl::GetMainFrameLastCommittedURL() const {
446 return url_; 453 return url_;
447 } 454 }
448 455
449 void InterstitialPageImpl::RenderViewTerminated( 456 void InterstitialPageImpl::RenderViewTerminated(
450 RenderViewHost* render_view_host, 457 RenderViewHost* render_view_host,
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
532 539
533 void InterstitialPageImpl::HandleKeyboardEvent( 540 void InterstitialPageImpl::HandleKeyboardEvent(
534 const NativeWebKeyboardEvent& event) { 541 const NativeWebKeyboardEvent& event) {
535 if (enabled()) 542 if (enabled())
536 render_widget_host_delegate_->HandleKeyboardEvent(event); 543 render_widget_host_delegate_->HandleKeyboardEvent(event);
537 } 544 }
538 545
539 #if defined(OS_WIN) 546 #if defined(OS_WIN)
540 gfx::NativeViewAccessible 547 gfx::NativeViewAccessible
541 InterstitialPageImpl::GetParentNativeViewAccessible() { 548 InterstitialPageImpl::GetParentNativeViewAccessible() {
542 return render_widget_host_delegate_->GetParentNativeViewAccessible(); 549 if (web_contents_) {
550 WebContentsImpl* wci = static_cast<WebContentsImpl*>(web_contents_);
551 return wci->GetParentNativeViewAccessible();
552 }
553 return NULL;
543 } 554 }
544 #endif 555 #endif
545 556
546 WebContents* InterstitialPageImpl::web_contents() const { 557 WebContents* InterstitialPageImpl::web_contents() const {
547 return web_contents_; 558 return web_contents_;
548 } 559 }
549 560
550 RenderViewHost* InterstitialPageImpl::CreateRenderViewHost() { 561 RenderViewHost* InterstitialPageImpl::CreateRenderViewHost() {
551 if (!enabled()) 562 if (!enabled())
552 return NULL; 563 return NULL;
(...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after
904 915
905 web_contents->GetDelegateView()->TakeFocus(reverse); 916 web_contents->GetDelegateView()->TakeFocus(reverse);
906 } 917 }
907 918
908 void InterstitialPageImpl::InterstitialPageRVHDelegateView::OnFindReply( 919 void InterstitialPageImpl::InterstitialPageRVHDelegateView::OnFindReply(
909 int request_id, int number_of_matches, const gfx::Rect& selection_rect, 920 int request_id, int number_of_matches, const gfx::Rect& selection_rect,
910 int active_match_ordinal, bool final_update) { 921 int active_match_ordinal, bool final_update) {
911 } 922 }
912 923
913 } // namespace content 924 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698