Move NavigationPolicyToDisposition() function into render_view_impl.cc

Since it's only used there. That way we will be able to move
window_open_disposition.h out of webkit/

BUG=146251
R=jam@chromium.org
TBR=darin@chromium.org

Review URL: https://codereview.chromium.org/11798003

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

content/renderer/render_view_impl.cc

@@ -146,6 +146,7 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIntentServiceInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerAction.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMessagePortChannel.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebNavigationPolicy.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNodeList.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPageSerializer.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPlugin.h"
@@ -505,6 +506,29 @@ static void NotifyTimezoneChange(WebKit::WebFrame* frame) {
     NotifyTimezoneChange(child);
 }
 
+static WindowOpenDisposition NavigationPolicyToDisposition(
+    WebNavigationPolicy policy) {
+  switch (policy) {
+    case WebKit::WebNavigationPolicyIgnore:
+      return IGNORE_ACTION;
+    case WebKit::WebNavigationPolicyDownload:
+      return SAVE_TO_DISK;
+    case WebKit::WebNavigationPolicyCurrentTab:
+      return CURRENT_TAB;
+    case WebKit::WebNavigationPolicyNewBackgroundTab:
+      return NEW_BACKGROUND_TAB;
+    case WebKit::WebNavigationPolicyNewForegroundTab:
+      return NEW_FOREGROUND_TAB;
+    case WebKit::WebNavigationPolicyNewWindow:
+      return NEW_WINDOW;
+    case WebKit::WebNavigationPolicyNewPopup:
+      return NEW_POPUP;
+  default:
+    NOTREACHED() << "Unexpected WebNavigationPolicy";
+    return IGNORE_ACTION;
+  }
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 
 struct RenderViewImpl::PendingFileChooser {

webkit/glue/webkit_glue.gypi

@@ -378,7 +378,6 @@
         'web_io_operators.cc',
         'web_io_operators.h',
         'window_open_disposition.h',
-        'window_open_disposition.cc',
         'worker_task_runner.cc',
         'worker_task_runner.h',
       ],

webkit/glue/window_open_disposition.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 "webkit/glue/window_open_disposition.h"
-
-#include "base/logging.h"
-
-WindowOpenDisposition NavigationPolicyToDisposition(
-    WebKit::WebNavigationPolicy policy) {
-  switch (policy) {
-    case WebKit::WebNavigationPolicyIgnore:
-      return IGNORE_ACTION;
-    case WebKit::WebNavigationPolicyDownload:
-      return SAVE_TO_DISK;
-    case WebKit::WebNavigationPolicyCurrentTab:
-      return CURRENT_TAB;
-    case WebKit::WebNavigationPolicyNewBackgroundTab:
-      return NEW_BACKGROUND_TAB;
-    case WebKit::WebNavigationPolicyNewForegroundTab:
-      return NEW_FOREGROUND_TAB;
-    case WebKit::WebNavigationPolicyNewWindow:
-      return NEW_WINDOW;
-    case WebKit::WebNavigationPolicyNewPopup:
-      return NEW_POPUP;
-  default:
-    NOTREACHED() << "Unexpected WebNavigationPolicy";
-    return IGNORE_ACTION;
-  }
-}

webkit/glue/window_open_disposition.h

@@ -5,9 +5,6 @@
 #ifndef WEBKIT_GLUE_WINDOW_OPEN_DISPOSITION_H_
 #define WEBKIT_GLUE_WINDOW_OPEN_DISPOSITION_H_
 
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebNavigationPolicy.h"
-#include "webkit/glue/webkit_glue_export.h"
-
 enum WindowOpenDisposition {
   UNKNOWN,
   SUPPRESS_OPEN,
@@ -23,8 +20,4 @@ enum WindowOpenDisposition {
   IGNORE_ACTION
 };
 
-// Conversion function:
-WEBKIT_GLUE_EXPORT WindowOpenDisposition NavigationPolicyToDisposition(
-    WebKit::WebNavigationPolicy policy);
-
 #endif  // WEBKIT_GLUE_WINDOW_OPEN_DISPOSITION_H_