chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc - Issue 11896047: Move the methods in disposition_utils.h and event_disposition.h to ui\base\window_open_disposition.…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/bookmarks/bookmark_bar_view.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/avatar_menu_bubble_view.cc ('k') | chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc

===================================================================

--- chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc (revision 178083)

+++ chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc (working copy)

@@ -19,7 +19,6 @@

#include "chrome/browser/bookmarks/bookmark_utils.h"

#include "chrome/browser/browser_shutdown.h"

#include "chrome/browser/defaults.h"

-#include "chrome/browser/event_disposition.h"

#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/prefs/pref_service.h"

#include "chrome/browser/profiles/profile.h"

@@ -61,6 +60,7 @@

#include "ui/base/l10n/l10n_util.h"

#include "ui/base/resource/resource_bundle.h"

#include "ui/base/text/text_elider.h"

+#include "ui/base/window_open_disposition.h"

#include "ui/gfx/canvas.h"

#include "ui/views/button_drag_utils.h"

#include "ui/views/controls/button/menu_button.h"

@@ -229,7 +229,7 @@

return false;

if (e.IsMouseEvent())

- return chrome::DispositionFromEventFlags(e.flags()) != CURRENT_TAB;

+ return ui::DispositionFromEventFlags(e.flags()) != CURRENT_TAB;

return false;

}

@@ -1058,7 +1058,7 @@

DCHECK(page_navigator_);

WindowOpenDisposition disposition_from_event_flags =

- chrome::DispositionFromEventFlags(event.flags());

+ ui::DispositionFromEventFlags(event.flags());

if (node->is_url()) {

RecordAppLaunch(browser_->profile(), node->url());