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

Unified Diff: chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm

Issue 9473001: Extract minimal RenderViewHost interface for embedders, leaving (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to LKGR. Created 8 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm
diff --git a/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm b/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm
index 434b3b79d4d63516d0252c03ac912b10e8b1d1eb..1214ff51bc9139404c87eab81c4f087f2ac2cf95 100644
--- a/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm
+++ b/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm
@@ -111,15 +111,17 @@ class SpellCheckRenderViewObserver : public content::RenderViewHostObserver {
- (id)initWithRenderWidgetHost:(RenderWidgetHost*)renderWidgetHost {
self = [super init];
if (self) {
- renderWidgetHost_ = (RenderWidgetHostImpl*)renderWidgetHost;
- NSView* nativeView = renderWidgetHost_->view()->GetNativeView();
+ renderWidgetHost_ = RenderWidgetHostImpl::From(renderWidgetHost);
+ NSView* nativeView = renderWidgetHost_->GetView()->GetNativeView();
view_id_util::SetID(nativeView, VIEW_ID_TAB_CONTAINER_FOCUS_VIEW);
if (renderWidgetHost_->IsRenderView()) {
spellingObserver_.reset(
new ChromeRenderWidgetHostViewMacDelegateInternal::
SpellCheckRenderViewObserver(
- static_cast<RenderViewHost*>(renderWidgetHost_), self));
+ static_cast<RenderViewHost*>(
+ static_cast<RenderViewHostImpl*>(renderWidgetHost_)),
+ self));
}
}
return self;
@@ -168,7 +170,8 @@ class SpellCheckRenderViewObserver : public content::RenderViewHostObserver {
if (!renderWidgetHost_ || !renderWidgetHost_->IsRenderView())
return NO;
if (DevToolsWindow::IsDevToolsWindow(
- static_cast<RenderViewHost*>(renderWidgetHost_))) {
+ static_cast<RenderViewHost*>(
+ static_cast<RenderViewHostImpl*>(renderWidgetHost_)))) {
return NO;
}
@@ -253,7 +256,7 @@ class SpellCheckRenderViewObserver : public content::RenderViewHostObserver {
BOOL *stop) {
if (phase == NSEventPhaseBegan) {
[historyOverlay showPanelForView:
- renderWidgetHost_->view()->GetNativeView()];
+ renderWidgetHost_->GetView()->GetNativeView()];
return;
}
@@ -333,7 +336,7 @@ class SpellCheckRenderViewObserver : public content::RenderViewHostObserver {
// This is also called from the Edit -> Spelling -> Check Spelling menu item.
- (void)checkSpelling:(id)sender {
renderWidgetHost_->Send(new SpellCheckMsg_AdvanceToNextMisspelling(
- renderWidgetHost_->routing_id()));
+ renderWidgetHost_->GetRoutingID()));
}
// This message is sent by the spelling panel whenever a word is ignored.
@@ -349,13 +352,13 @@ class SpellCheckRenderViewObserver : public content::RenderViewHostObserver {
- (void)showGuessPanel:(id)sender {
renderWidgetHost_->Send(new SpellCheckMsg_ToggleSpellPanel(
- renderWidgetHost_->routing_id(),
+ renderWidgetHost_->GetRoutingID(),
spellcheck_mac::SpellingPanelVisible()));
}
- (void)toggleContinuousSpellChecking:(id)sender {
renderWidgetHost_->Send(
- new SpellCheckMsg_ToggleSpellCheck(renderWidgetHost_->routing_id()));
+ new SpellCheckMsg_ToggleSpellCheck(renderWidgetHost_->GetRoutingID()));
}
- (void)spellCheckEnabled:(BOOL)enabled checked:(BOOL)checked {

Powered by Google App Engine
This is Rietveld 408576698