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

chrome/browser/ui/webui/web_ui_util.cc

 // Copyright (c) 2012 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/web_ui_util.h"
 
 #include <vector>
 
 #include "base/base64.h"
 #include "base/debug/trace_event.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted_memory.h"
-#include "chrome/browser/disposition_utils.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/escape.h"
 #include "grit/platform_locale_settings.h"
+#include "ui/base/window_open_disposition.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined (TOOLKIT_GTK)
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/font.h"
 #endif
 
@@ skipping 53 matching lines @@
   bool alt_key = false;
   bool ctrl_key = false;
   bool meta_key = false;
   bool shift_key = false;
 
   CHECK(args->GetDouble(start_index++, &button));
   CHECK(args->GetBoolean(start_index++, &alt_key));
   CHECK(args->GetBoolean(start_index++, &ctrl_key));
   CHECK(args->GetBoolean(start_index++, &meta_key));
   CHECK(args->GetBoolean(start_index++, &shift_key));
-  return disposition_utils::DispositionFromClick(button == 1.0, alt_key,
-                                                 ctrl_key, meta_key, shift_key);
-
+  return ui::DispositionFromClick(
+      button == 1.0, alt_key, ctrl_key, meta_key, shift_key);
 }
 
 bool ParseScaleFactor(const base::StringPiece& identifier,
                       ui::ScaleFactor* scale_factor) {
   *scale_factor = ui::SCALE_FACTOR_100P;
   for (size_t i = 0; i < arraysize(kScaleFactorMap); i++) {
     if (identifier == kScaleFactorMap[i].name) {
       *scale_factor = kScaleFactorMap[i].scale_factor;
       return true;
     }
@@ skipping 49 matching lines @@
 #endif
 
   localized_strings->SetString("fontfamily", font_family);
   localized_strings->SetString("fontsize",
       l10n_util::GetStringUTF8(web_font_size_id));
   localized_strings->SetString("textdirection",
       base::i18n::IsRTL() ? "rtl" : "ltr");
 }
 
 }  // namespace web_ui_util