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

chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.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/gtk/bookmarks/bookmark_sub_menu_model_gtk.h"
 
 #include "base/stl_util.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
-#include "chrome/browser/event_disposition.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h"
 #include "chrome/browser/ui/gtk/menu_gtk.h"
 #include "grit/generated_resources.h"
 #include "ui/base/gtk/menu_label_accelerator_util.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/base/window_open_disposition.h"
 
 using content::OpenURLParams;
 using content::PageNavigator;
 
 // Per chrome/app/chrome_command_ids.h, values < 4000 are for "dynamic menu
 // items". We only use one command id for all the bookmarks, because we handle
 // bookmark item activations directly. So we pick a suitably large random value
 // and use that to avoid accidental conflicts with other dynamic items.
 static const int kBookmarkItemCommandId = 1759;
 
@@ skipping 25 matching lines @@
 
 void BookmarkNodeMenuModel::MenuClosed() {
   Clear();
 }
 
 void BookmarkNodeMenuModel::ActivatedAt(int index) {
   NavigateToMenuItem(index, CURRENT_TAB);
 }
 
 void BookmarkNodeMenuModel::ActivatedAt(int index, int event_flags) {
-  NavigateToMenuItem(index, chrome::DispositionFromEventFlags(event_flags));
+  NavigateToMenuItem(index, ui::DispositionFromEventFlags(event_flags));
 }
 
 void BookmarkNodeMenuModel::PopulateMenu() {
   DCHECK(submenus_.empty());
   for (int i = 0; i < node_->child_count(); ++i) {
     const BookmarkNode* child = node_->GetChild(i);
     if (child->is_folder()) {
       AddSubMenuForNode(child);
     } else {
       // Ironically the label will end up getting converted back to UTF8 later.
@@ skipping 144 matching lines @@
 
 bool BookmarkSubMenuModel::IsVisibleAt(int index) const {
   // We don't want the delegate interfering with bookmark items.
   return index >= fixed_items_ || SimpleMenuModel::IsVisibleAt(index);
 }
 
 // static
 bool BookmarkSubMenuModel::IsBookmarkItemCommandId(int command_id) {
   return command_id == kBookmarkItemCommandId;
 }