Move some more methods from WebViewDelegate to WebViewClient.

R=dglazkov
BUG=10033
TEST=none

Review URL: http://codereview.chromium.org/224010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27054 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 28 insertions, 21 deletions

diff --git a/chrome/renderer/print_web_view_helper.h b/chrome/renderer/print_web_view_helper.h
index 6e9ae43..69fd333 100644
--- a/chrome/renderer/print_web_view_helper.h
+++ b/chrome/renderer/print_web_view_helper.h
@@ -125,6 +125,9 @@ class PrintWebViewHelper : public WebViewDelegate {
       const WebKit::WebConsoleMessage& message,
       const WebKit::WebString& source_name, unsigned source_line) {}
   virtual void printPage(WebKit::WebFrame* frame) {}
+  virtual WebKit::WebNotificationPresenter* notificationPresenter() {
+    return NULL;
+  }
   virtual void didStartLoading() {}
   virtual void didStopLoading();
   virtual bool shouldBeginEditing(const WebKit::WebRange& range) {
@@ -157,6 +160,7 @@ class PrintWebViewHelper : public WebViewDelegate {
   virtual void didChangeContents() {}
   virtual void didExecuteCommand(const WebKit::WebString& command_name) {}
   virtual void didEndEditing() {}
+  virtual bool handleCurrentKeyboardEvent() { return false; }
   virtual void spellCheck(
       const WebKit::WebString& text, int& offset, int& length) {}
   virtual WebKit::WebString autoCorrectWord(
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 1ec105e..09f405e 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -1516,6 +1516,26 @@ void RenderView::didExecuteCommand(const WebString& command_name) {
   UserMetricsRecordAction(name);
 }
 
+bool RenderView::handleCurrentKeyboardEvent() {
+  if (edit_commands_.empty())
+    return false;
+
+  WebFrame* frame = webview()->GetFocusedFrame();
+  if (!frame)
+    return false;
+
+  EditCommands::iterator it = edit_commands_.begin();
+  EditCommands::iterator end = edit_commands_.end();
+
+  for (; it != end; ++it) {
+    if (!frame->executeCommand(WebString::fromUTF8(it->name),
+                               WebString::fromUTF8(it->value)))
+      break;
+  }
+
+  return true;
+}
+
 void RenderView::spellCheck(
     const WebString& text, int& misspelled_offset, int& misspelled_length) {
   EnsureDocumentTag();
@@ -3544,26 +3564,6 @@ void RenderView::DidHandleKeyEvent() {
   edit_commands_.clear();
 }
 
-bool RenderView::HandleCurrentKeyboardEvent() {
-  if (edit_commands_.empty())
-    return false;
-
-  WebFrame* frame = webview()->GetFocusedFrame();
-  if (!frame)
-    return false;
-
-  EditCommands::iterator it = edit_commands_.begin();
-  EditCommands::iterator end = edit_commands_.end();
-
-  for (; it != end; ++it) {
-    if (!frame->executeCommand(WebString::fromUTF8(it->name),
-                               WebString::fromUTF8(it->value)))
-      break;
-  }
-
-  return true;
-}
-
 void RenderView::EnsureDocumentTag() {
   // TODO(darin): There's actually no reason for this to be here.  We should
   // have the browser side manage the document tag.
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index c510c63..69bfbc5 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -214,7 +214,6 @@ class RenderView : public RenderWidget,
   virtual void FocusAccessibilityObject(WebCore::AccessibilityObject* acc_obj);
   virtual void UserMetricsRecordAction(const std::wstring& action);
   virtual void DnsPrefetch(const std::vector<std::string>& host_names);
-  virtual bool HandleCurrentKeyboardEvent();
 
   // WebKit::WebViewClient
   virtual WebView* createView(WebKit::WebFrame* creator);
@@ -225,6 +224,9 @@ class RenderView : public RenderWidget,
       const WebKit::WebConsoleMessage& message,
       const WebKit::WebString& source_name, unsigned source_line);
   virtual void printPage(WebKit::WebFrame* frame);
+  virtual WebKit::WebNotificationPresenter* notificationPresenter() {
+    return NULL;
+  }
   virtual void didStartLoading();
   virtual void didStopLoading();
   virtual bool shouldBeginEditing(const WebKit::WebRange& range);
@@ -249,6 +251,7 @@ class RenderView : public RenderWidget,
   virtual void didChangeContents() {}
   virtual void didExecuteCommand(const WebKit::WebString& command_name);
   virtual void didEndEditing() {}
+  virtual bool handleCurrentKeyboardEvent();
   virtual void spellCheck(
       const WebKit::WebString& text, int& offset, int& length);
   virtual WebKit::WebString autoCorrectWord(