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

chrome/browser/ui/app_list/search_builder.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/app_list/search_builder.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/autocomplete/autocomplete_controller.h"
 #include "chrome/browser/autocomplete/autocomplete_input.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/autocomplete_provider.h"
 #include "chrome/browser/autocomplete/autocomplete_result.h"
-#include "chrome/browser/event_disposition.h"
 #include "chrome/browser/extensions/api/omnibox/omnibox_api.h"
 #include "chrome/browser/extensions/extension_icon_image.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/app_list/app_list_switches.h"
 #include "ui/app_list/search_box_model.h"
 #include "ui/app_list/search_result.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/base/window_open_disposition.h"
 
 #if defined(OS_CHROMEOS)
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/autocomplete/contact_provider_chromeos.h"
 #include "chrome/browser/chromeos/contacts/contact.pb.h"
 #include "chrome/browser/chromeos/contacts/contact_manager.h"
 #include "chrome/browser/extensions/api/rtc_private/rtc_private_api.h"
 #include "chrome/browser/image_decoder.h"
 #include "chrome/common/chrome_switches.h"
 #endif
@@ skipping 311 matching lines @@
 #if defined(OS_CHROMEOS)
   } else if (match.type == AutocompleteMatch::CONTACT) {
     // Pass 0 for |action_index| to trigger a chat request.
     InvokeResultAction(result, 0, event_flags);
 #endif
   } else {
     // TODO(xiyuan): What should we do for alternate url case?
     chrome::NavigateParams params(profile_,
                                   match.destination_url,
                                   match.transition);
-    params.disposition = chrome::DispositionFromEventFlags(event_flags);
+    params.disposition = ui::DispositionFromEventFlags(event_flags);
     chrome::Navigate(&params);
   }
 }
 
 void SearchBuilder::InvokeResultAction(const app_list::SearchResult& result,
                                        int action_index,
                                        int event_flags) {
 #if defined(OS_CHROMEOS)
   const SearchBuilderResult* builder_result =
       static_cast<const SearchBuilderResult*>(&result);
@@ skipping 57 matching lines @@
     result->Init(profile_, *it);
     results_->Add(result);
   }
 }
 
 void SearchBuilder::OnResultChanged(bool default_match_changed) {
   // TODO(xiyuan): Handle default match properly.
   const AutocompleteResult& ac_result = controller_->result();
   PopulateFromACResult(ac_result);
 }