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

Unified Diff: chrome/browser/ui/webui/generic_handler.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
« no previous file with comments | « chrome/browser/ui/views/web_intent_picker_views.cc ('k') | chrome/browser/ui/webui/web_ui_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/generic_handler.cc
===================================================================
--- chrome/browser/ui/webui/generic_handler.cc (revision 178083)
+++ chrome/browser/ui/webui/generic_handler.cc (working copy)
@@ -8,9 +8,9 @@
#include "base/bind_helpers.h"
#include "base/logging.h"
#include "base/values.h"
-#include "chrome/browser/disposition_utils.h"
#include "content/public/browser//web_ui.h"
#include "content/public/browser/web_contents.h"
+#include "ui/base/window_open_disposition.h"
using content::OpenURLParams;
@@ -45,9 +45,8 @@
CHECK(button == 0.0 || button == 1.0);
bool middle_button = (button == 1.0);
- WindowOpenDisposition disposition =
- disposition_utils::DispositionFromClick(middle_button, alt_key, ctrl_key,
- meta_key, shift_key);
+ WindowOpenDisposition disposition = ui::DispositionFromClick(
+ middle_button, alt_key, ctrl_key, meta_key, shift_key);
if (disposition == CURRENT_TAB && target_string == "_blank")
disposition = NEW_FOREGROUND_TAB;
« no previous file with comments | « chrome/browser/ui/views/web_intent_picker_views.cc ('k') | chrome/browser/ui/webui/web_ui_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698