Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3240)

Unified Diff: chrome/browser/ui/extensions/application_launch.cc

Issue 11896047: Move the methods in disposition_utils.h and event_disposition.h to ui\base\window_open_disposition.… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix regex in ui.gyp Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/extensions/application_launch.cc
===================================================================
--- chrome/browser/ui/extensions/application_launch.cc (revision 178083)
+++ chrome/browser/ui/extensions/application_launch.cc (working copy)
@@ -6,7 +6,6 @@
#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"
@@ -29,6 +28,7 @@
#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)
@@ -270,7 +270,7 @@
: 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) {
« no previous file with comments | « chrome/browser/ui/cocoa/event_utils.mm ('k') | chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698