Cleanups for http://codereview.chromium.org/3176027

chrome/browser/renderer_host/render_widget_host_view_mac.mm

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <QuartzCore/QuartzCore.h>
 
 #include "chrome/browser/renderer_host/render_widget_host_view_mac.h"
 
 #include "app/surface/io_surface_support_mac.h"
 #import "base/chrome_application_mac.h"
@@ skipping 119 matching lines @@
 
 }  // namespace
 
 // AcceleratedPluginView ------------------------------------------------------
 
 // This subclass of NSView hosts the output of accelerated plugins on
 // the page.
 
 // Informal protocol implemented by windows that need to be informed explicitly
 // about underlay surfaces.
-@protocol UnderlayableSurface
+@interface RenderWidgetHostViewCocoa (UnderlayableSurface)
 - (void)underlaySurfaceAdded;
 - (void)underlaySurfaceRemoved;
 @end
 
 @interface AcceleratedPluginView : NSView {
   scoped_nsobject<NSOpenGLPixelFormat> glPixelFormat_;
   CGLPixelFormatObj cglPixelFormat_;  // weak, backed by |glPixelFormat_|.
   scoped_nsobject<NSOpenGLContext> glContext_;
   CGLContextObj cglContext_;  // weak, backed by |glContext_|.
 
@@ skipping 161 matching lines @@
   [[NSNotificationCenter defaultCenter] removeObserver:self];
   [super dealloc];
 }
 
 - (void)viewWillMoveToWindow:(NSWindow*)newWindow {
   if (CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kDisableHolePunching)) {
     return;
   }
 
-  if ([self window] &&
-      [[self window] respondsToSelector:@selector(underlaySurfaceRemoved)]) {
+  if ([[self window] respondsToSelector:@selector(underlaySurfaceRemoved)]) {
     [static_cast<id>([self window]) underlaySurfaceRemoved];
   }
 
-  if (newWindow &&
-      [newWindow respondsToSelector:@selector(underlaySurfaceAdded)]) {
+  if ([newWindow respondsToSelector:@selector(underlaySurfaceAdded)]) {
     [static_cast<id>(newWindow) underlaySurfaceAdded];
   }
 }
 @end
 
 // RenderWidgetHostView --------------------------------------------------------
 
 // static
 RenderWidgetHostView* RenderWidgetHostView::CreateViewForWidget(
     RenderWidgetHost* widget) {
@@ skipping 2041 matching lines @@
   if (!string) return NO;
 
   // If the user is currently using an IME, confirm the IME input,
   // and then insert the text from the service, the same as TextEdit and Safari.
   [self confirmComposition];
   [self insertText:string];
   return YES;
 }
 
 @end