Rename AwRenderFrameObserver to AwPrintRenderFrameObserver

The name AwRenderFrameObserver is insufficiently explicit since it deals only with printing. BUG= Review URL: https://codereview.chromium.org/314103002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275256 0039d316-1c4b-4281-b951-d872f2087c98
Denger-Network · Jun 5, 2014 · 0cce1ab · 0cce1ab
1 parent 7b62219
commit 0cce1ab
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 18 deletions.
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
@@ -231,8 +231,6 @@
         'renderer/aw_key_systems.h',
         'renderer/aw_permission_client.cc',
         'renderer/aw_permission_client.h',
-        'renderer/aw_render_frame_observer.cc',
-        'renderer/aw_render_frame_observer.h',
         'renderer/aw_render_process_observer.cc',
         'renderer/aw_render_process_observer.h',
         'renderer/aw_render_view_ext.cc',
@@ -241,6 +239,8 @@
         'renderer/print_web_view_helper.h',
         'renderer/print_web_view_helper_android.cc',
         'renderer/print_web_view_helper_linux.cc',
+        'renderer/print_render_frame_observer.cc',
+        'renderer/print_render_frame_observer.h',
       ],
     },
   ],

diff --git a/android_webview/renderer/aw_content_renderer_client.cc b/android_webview/renderer/aw_content_renderer_client.cc
@@ -9,8 +9,8 @@
 #include "android_webview/common/url_constants.h"
 #include "android_webview/renderer/aw_key_systems.h"
 #include "android_webview/renderer/aw_permission_client.h"
-#include "android_webview/renderer/aw_render_frame_observer.h"
 #include "android_webview/renderer/aw_render_view_ext.h"
+#include "android_webview/renderer/print_render_frame_observer.h"
 #include "android_webview/renderer/print_web_view_helper.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
@@ -119,7 +119,7 @@ bool AwContentRendererClient::HandleNavigation(
 void AwContentRendererClient::RenderFrameCreated(
     content::RenderFrame* render_frame) {
   new AwPermissionClient(render_frame);
-  new AwRenderFrameObserver(render_frame);
+  new PrintRenderFrameObserver(render_frame);
 
   // TODO(jam): when the frame tree moves into content and parent() works at
   // RenderFrame construction, simplify this by just checking parent().

diff --git a/...view/renderer/aw_render_frame_observer.cc → ...w/renderer/print_render_frame_observer.cc b/...view/renderer/aw_render_frame_observer.cc → ...w/renderer/print_render_frame_observer.cc
@@ -2,24 +2,26 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "android_webview/renderer/aw_render_frame_observer.h"
+#include "android_webview/renderer/print_render_frame_observer.h"
 
 #include "android_webview/common/print_messages.h"
 #include "android_webview/renderer/print_web_view_helper.h"
 #include "content/public/renderer/render_frame.h"
 
 namespace android_webview {
 
-AwRenderFrameObserver::AwRenderFrameObserver(content::RenderFrame* render_frame)
+PrintRenderFrameObserver::PrintRenderFrameObserver(
+    content::RenderFrame* render_frame)
     : content::RenderFrameObserver(render_frame) {
 }
 
-AwRenderFrameObserver::~AwRenderFrameObserver() {
+PrintRenderFrameObserver::~PrintRenderFrameObserver() {
 }
 
-bool AwRenderFrameObserver::OnMessageReceived(const IPC::Message& message) {
+bool PrintRenderFrameObserver::OnMessageReceived(
+    const IPC::Message& message) {
   bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP(AwRenderFrameObserver, message)
+  IPC_BEGIN_MESSAGE_MAP(PrintRenderFrameObserver, message)
     IPC_MESSAGE_HANDLER(PrintMsg_PrintNodeUnderContextMenu,
                         OnPrintNodeUnderContextMenu)
     IPC_MESSAGE_UNHANDLED(handled = false)
@@ -28,7 +30,7 @@ bool AwRenderFrameObserver::OnMessageReceived(const IPC::Message& message) {
   return handled;
 }
 
-void AwRenderFrameObserver::OnPrintNodeUnderContextMenu() {
+void PrintRenderFrameObserver::OnPrintNodeUnderContextMenu() {
   printing::PrintWebViewHelper* helper =
       printing::PrintWebViewHelper::Get(render_frame()->GetRenderView());
   if (helper)

diff --git a/...bview/renderer/aw_render_frame_observer.h → ...ew/renderer/print_render_frame_observer.h b/...bview/renderer/aw_render_frame_observer.h → ...ew/renderer/print_render_frame_observer.h
@@ -2,30 +2,29 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ANDROID_WEBVIEW_RENDERER_AW_RENDER_FRAME_OBSERVER_H_
-#define ANDROID_WEBVIEW_RENDERER_AW_RENDER_FRAME_OBSERVER_H_
+#ifndef ANDROID_WEBVIEW_RENDERER_PRINT_RENDER_FRAME_OBSERVER_H_
+#define ANDROID_WEBVIEW_RENDERER_PRINT_RENDER_FRAME_OBSERVER_H_
 
 #include "content/public/renderer/render_frame_observer.h"
 
 namespace android_webview {
 
-// Android WebView implementation of blink::WebPermissionClient.
-class AwRenderFrameObserver : public content::RenderFrameObserver {
+class PrintRenderFrameObserver : public content::RenderFrameObserver {
  public:
-  explicit AwRenderFrameObserver(content::RenderFrame* render_view);
+  explicit PrintRenderFrameObserver(content::RenderFrame* render_view);
 
  private:
-  virtual ~AwRenderFrameObserver();
+  virtual ~PrintRenderFrameObserver();
 
   // RenderFrameObserver implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   // IPC handlers
   void OnPrintNodeUnderContextMenu();
 
-  DISALLOW_COPY_AND_ASSIGN(AwRenderFrameObserver);
+  DISALLOW_COPY_AND_ASSIGN(PrintRenderFrameObserver);
 };
 
 }  // namespace android_webview
 
-#endif  // ANDROID_WEBVIEW_RENDERER_AW_RENDER_FRAME_OBSERVER_H_
+#endif  // ANDROID_WEBVIEW_RENDERER_PRINT_RENDER_FRAME_OBSERVER_H_