Merge NOTIFICATION_RENDER_VIEW_HOST_CHANGED into NOTIFICATION_WEB_CONTENTS_SWAPPED.

apps/native_app_window.h

 // Copyright 2013 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.
 
 #ifndef APPS_NATIVE_APP_WINDOW_H_
 #define APPS_NATIVE_APP_WINDOW_H_
 
 #include "apps/shell_window.h"
 #include "components/web_modal/web_contents_modal_dialog_host.h"
 #include "ui/base/base_window.h"
@@ skipping 25 matching lines @@
   virtual void UpdateWindowIcon() = 0;
 
   // Called when the title of the window changes.
   virtual void UpdateWindowTitle() = 0;
 
   // Allows the window to handle unhandled keyboard messages coming back from
   // the renderer.
   virtual void HandleKeyboardEvent(
       const content::NativeWebKeyboardEvent& event) = 0;
 
-  // TODO(jianli): once http://crbug.com/123007 is fixed, we'll no longer need
-  // this.
-  virtual void RenderViewHostChanged() = 0;
-
   // Returns the difference between the window bounds (including titlebar and
   // borders) and the content bounds, if any.
   virtual gfx::Insets GetFrameInsets() const = 0;
 
   // Hide or show this window as part of hiding or showing the app.
   // This may have different logic to Hide, Show, and ShowInactive as those are
   // called via the AppWindow javascript API.
   virtual void ShowWithApp() = 0;
   virtual void HideWithApp() = 0;
 
   virtual ~NativeAppWindow() {}
 };
 
 }  // namespace apps
 
 #endif  // APPS_NATIVE_APP_WINDOW_H_