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

chrome/browser/ui/extensions/application_launch.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/extensions/application_launch.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
-#include "chrome/browser/event_disposition.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/platform_app_launcher.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/manifest_url_handler.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/common/renderer_preferences.h"
+#include "ui/base/window_open_disposition.h"
 #include "ui/gfx/rect.h"
 
 #if defined(OS_WIN)
 #include "win8/util/win8_util.h"
 #endif
 
 using content::WebContents;
 using extensions::Extension;
 using extensions::ExtensionPrefs;
 
@@ skipping 221 matching lines @@
   container = service->extension_prefs()->GetLaunchContainer(
       extension, extensions::ExtensionPrefs::LAUNCH_REGULAR);
 }
 
 LaunchParams::LaunchParams(Profile* profile,
                            const extensions::Extension* extension,
                            int event_flags)
     : profile(profile),
       extension(extension),
       container(extension_misc::LAUNCH_NONE),
-      disposition(chrome::DispositionFromEventFlags(event_flags)),
+      disposition(ui::DispositionFromEventFlags(event_flags)),
       override_url(),
       command_line(NULL) {
   if (disposition == NEW_FOREGROUND_TAB || disposition == NEW_BACKGROUND_TAB) {
     container = extension_misc::LAUNCH_TAB;
   } else if (disposition == NEW_WINDOW) {
     container = extension_misc::LAUNCH_WINDOW;
   } else {
     ExtensionService* service =
         extensions::ExtensionSystem::Get(profile)->extension_service();
     DCHECK(service);
@@ skipping 68 matching lines @@
   // OnDidGetApplicationInfo, which calls
   // web_app::UpdateShortcutForTabContents when it sees UPDATE_SHORTCUT as
   // pending web app action.
   extensions::TabHelper::FromWebContents(tab)->set_pending_web_app_action(
       extensions::TabHelper::UPDATE_SHORTCUT);
 
   return tab;
 }
 
 }  // namespace application_launch