Merge NOTIFICATION_RENDER_VIEW_HOST_CHANGED into NOTIFICATION_WEB_CONTENTS_SWAPPED.

chrome/browser/ui/panels/panel.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/panels/panel.h"
 
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 132 matching lines @@
 void PanelExtensionWindowController::SetFullscreenMode(
     bool is_fullscreen, const GURL& extension_url) const {
   // Do nothing. Panels cannot be fullscreen.
 }
 
 bool PanelExtensionWindowController::IsVisibleToExtension(
     const extensions::Extension* extension) const {
   return extension->id() == panel_->extension_id();
 }
 
-}  // namespace internal
+}  // namespace panel_internal
 
 Panel::~Panel() {
   DCHECK(!collection_);
   // Invoked by native panel destructor. Do not access native_panel_ here.
   chrome::EndKeepAlive();  // Remove shutdown prevention.
 }
 
 PanelManager* Panel::manager() const {
   return PanelManager::GetInstance();
 }
@@ skipping 260 matching lines @@
     default:
       LOG(WARNING) << "Received unimplemented command: " << id;
       break;
   }
 }
 
 void Panel::Observe(int type,
                     const content::NotificationSource& source,
                     const content::NotificationDetails& details) {
   switch (type) {
-    case content::NOTIFICATION_WEB_CONTENTS_SWAPPED:
+    case content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED:
       ConfigureAutoResize(content::Source<content::WebContents>(source).ptr());
       break;
     case chrome::NOTIFICATION_EXTENSION_UNLOADED:
       if (content::Details<extensions::UnloadedExtensionInfo>(
               details)->extension->id() == extension_id())
         Close();
       break;
     case chrome::NOTIFICATION_APP_TERMINATING:
       Close();
       break;
@@ skipping 130 matching lines @@
   if (auto_resizable_ == resizable)
     return;
 
   auto_resizable_ = resizable;
   content::WebContents* web_contents = GetWebContents();
   if (auto_resizable_) {
     if (web_contents)
       EnableWebContentsAutoResize(web_contents);
   } else {
     if (web_contents) {
-      registrar_.Remove(this, content::NOTIFICATION_WEB_CONTENTS_SWAPPED,
+      registrar_.Remove(this, content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED,
                         content::Source<content::WebContents>(web_contents));
 
       // NULL might be returned if the tab has not been added.
       RenderViewHost* render_view_host = web_contents->GetRenderViewHost();
       if (render_view_host)
         render_view_host->DisableAutoResize(full_size_);
     }
   }
 }
 
 void Panel::EnableWebContentsAutoResize(content::WebContents* web_contents) {
   DCHECK(web_contents);
   ConfigureAutoResize(web_contents);
 
   // We also need to know when the render view host changes in order
   // to turn on auto-resize notifications in the new render view host.
   if (!registrar_.IsRegistered(
-          this, content::NOTIFICATION_WEB_CONTENTS_SWAPPED,
+          this, content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED,
           content::Source<content::WebContents>(web_contents))) {
     registrar_.Add(
         this,
-        content::NOTIFICATION_WEB_CONTENTS_SWAPPED,
+        content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED,
         content::Source<content::WebContents>(web_contents));
   }
 }
 
 void Panel::OnContentsAutoResized(const gfx::Size& new_content_size) {
   DCHECK(auto_resizable_);
   if (!collection_)
     return;
 
   gfx::Size new_window_size =
@@ skipping 271 matching lines @@
 
 // static
 void Panel::FormatTitleForDisplay(string16* title) {
   size_t current_index = 0;
   size_t match_index;
   while ((match_index = title->find(L'\n', current_index)) != string16::npos) {
     title->replace(match_index, 1, string16());
     current_index = match_index;
   }
 }