Move extension messages to their own file and add a RenderViewObserver to start moving the extens...

chrome/renderer/extensions/renderer_extension_bindings.cc

 // Copyright (c) 2009 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/renderer/extensions/renderer_extension_bindings.h"
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/lazy_instance.h"
 #include "base/values.h"
 #include "chrome/common/extensions/extension_message_bundle.h"
-#include "chrome/common/render_messages.h"
+#include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/renderer/extensions/bindings_utils.h"
 #include "chrome/renderer/extensions/event_bindings.h"
 #include "chrome/renderer/render_thread.h"
 #include "content/renderer/render_view.h"
 #include "grit/renderer_resources.h"
 
 using bindings_utils::GetStringResource;
 using bindings_utils::ExtensionBase;
 
@@ skipping 72 matching lines @@
     RenderView* renderview = bindings_utils::GetRenderViewForCurrentContext();
     if (!renderview)
       return v8::Undefined();
 
     if (args.Length() >= 3 && args[0]->IsString() && args[1]->IsString() &&
         args[2]->IsString()) {
       std::string source_id = *v8::String::Utf8Value(args[0]->ToString());
       std::string target_id = *v8::String::Utf8Value(args[1]->ToString());
       std::string channel_name = *v8::String::Utf8Value(args[2]->ToString());
       int port_id = -1;
-      renderview->Send(new ViewHostMsg_OpenChannelToExtension(
+      renderview->Send(new ExtensionHostMsg_OpenChannelToExtension(
           renderview->routing_id(), source_id, target_id,
           channel_name, &port_id));
       return v8::Integer::New(port_id);
     }
     return v8::Undefined();
   }
 
   // Sends a message along the given channel.
   static v8::Handle<v8::Value> PostMessage(const v8::Arguments& args) {
     RenderView* renderview = bindings_utils::GetRenderViewForCurrentContext();
     if (!renderview)
       return v8::Undefined();
 
     if (args.Length() >= 2 && args[0]->IsInt32() && args[1]->IsString()) {
       int port_id = args[0]->Int32Value();
       if (!HasPortData(port_id)) {
         return v8::ThrowException(v8::Exception::Error(
           v8::String::New(kPortClosedError)));
       }
       std::string message = *v8::String::Utf8Value(args[1]->ToString());
-      renderview->Send(new ViewHostMsg_ExtensionPostMessage(
+      renderview->Send(new ExtensionHostMsg_PostMessage(
           renderview->routing_id(), port_id, message));
     }
     return v8::Undefined();
   }
 
   // Forcefully disconnects a port.
   static v8::Handle<v8::Value> CloseChannel(const v8::Arguments& args) {
     if (args.Length() >= 2 && args[0]->IsInt32() && args[1]->IsBoolean()) {
       int port_id = args[0]->Int32Value();
       if (!HasPortData(port_id)) {
         return v8::Undefined();
       }
       // Send via the RenderThread because the RenderView might be closing.
       bool notify_browser = args[1]->BooleanValue();
       if (notify_browser)
         EventBindings::GetRenderThread()->Send(
-            new ViewHostMsg_ExtensionCloseChannel(port_id));
+            new ExtensionHostMsg_CloseChannel(port_id));
       ClearPortData(port_id);
     }
     return v8::Undefined();
   }
 
   // A new port has been created for a context.  This occurs both when script
   // opens a connection, and when a connection is opened to this script.
   static v8::Handle<v8::Value> PortAddRef(const v8::Arguments& args) {
     if (args.Length() >= 1 && args[0]->IsInt32()) {
       int port_id = args[0]->Int32Value();
       ++GetPortData(port_id).ref_count;
     }
     return v8::Undefined();
   }
 
   // The frame a port lived in has been destroyed.  When there are no more
   // frames with a reference to a given port, we will disconnect it and notify
   // the other end of the channel.
   static v8::Handle<v8::Value> PortRelease(const v8::Arguments& args) {
     if (args.Length() >= 1 && args[0]->IsInt32()) {
       int port_id = args[0]->Int32Value();
       if (HasPortData(port_id) && --GetPortData(port_id).ref_count == 0) {
         // Send via the RenderThread because the RenderView might be closing.
         EventBindings::GetRenderThread()->Send(
-            new ViewHostMsg_ExtensionCloseChannel(port_id));
+            new ExtensionHostMsg_CloseChannel(port_id));
         ClearPortData(port_id);
       }
     }
     return v8::Undefined();
   }
 
   static v8::Handle<v8::Value> GetL10nMessage(const v8::Arguments& args) {
     if (args.Length() != 3 || !args[0]->IsString()) {
       NOTREACHED() << "Bad arguments";
       return v8::Undefined();
@@ skipping 11 matching lines @@
     L10nMessagesMap* l10n_messages = GetL10nMessagesMap(extension_id);
     if (!l10n_messages) {
       // Get the current RenderView so that we can send a routed IPC message
       // from the correct source.
       RenderView* renderview = bindings_utils::GetRenderViewForCurrentContext();
       if (!renderview)
         return v8::Undefined();
 
       L10nMessagesMap messages;
       // A sync call to load message catalogs for current extension.
-      renderview->Send(new ViewHostMsg_GetExtensionMessageBundle(
+      renderview->Send(new ExtensionHostMsg_GetMessageBundle(
           extension_id, &messages));
 
       // Save messages we got.
       ExtensionToL10nMessagesMap& l10n_messages_map =
           *GetExtensionToL10nMessagesMap();
       l10n_messages_map[extension_id] = messages;
 
       l10n_messages = GetL10nMessagesMap(extension_id);
     }
 
@@ skipping 94 matching lines @@
                                        const GURL& event_url) {
   v8::HandleScope handle_scope;
   std::vector< v8::Handle<v8::Value> > argv = ListValueToV8(args);
   EventBindings::CallFunction(extension_id,
                               function_name,
                               argv.size(),
                               &argv[0],
                               renderview,
                               event_url);
 }