Move the methods in disposition_utils.h and event_disposition.h to ui\base\window_open_disposition.…

chrome/browser/ui/webui/generic_handler.cc

 // Copyright (c) 2011 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/webui/generic_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/values.h"
-#include "chrome/browser/disposition_utils.h"
 #include "content/public/browser//web_ui.h"
 #include "content/public/browser/web_contents.h"
+#include "ui/base/window_open_disposition.h"
 
 using content::OpenURLParams;
 
 GenericHandler::GenericHandler() {
 }
 
 GenericHandler::~GenericHandler() {
 }
 
 void GenericHandler::RegisterMessages() {
@@ skipping 14 matching lines @@
   CHECK(args->GetString(1, &target_string));
   CHECK(args->GetDouble(2, &button));
   CHECK(args->GetBoolean(3, &alt_key));
   CHECK(args->GetBoolean(4, &ctrl_key));
   CHECK(args->GetBoolean(5, &meta_key));
   CHECK(args->GetBoolean(6, &shift_key));
 
   CHECK(button == 0.0 || button == 1.0);
   bool middle_button = (button == 1.0);
 
-  WindowOpenDisposition disposition =
-      disposition_utils::DispositionFromClick(middle_button, alt_key, ctrl_key,
-                                              meta_key, shift_key);
+  WindowOpenDisposition disposition = ui::DispositionFromClick(
+      middle_button, alt_key, ctrl_key, meta_key, shift_key);
   if (disposition == CURRENT_TAB && target_string == "_blank")
     disposition = NEW_FOREGROUND_TAB;
 
   web_ui()->GetWebContents()->OpenURL(OpenURLParams(
       GURL(url_string), content::Referrer(), disposition,
       content::PAGE_TRANSITION_LINK, false));
 
   // This may delete us!
 }