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

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

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

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

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

@@ -9,7 +9,6 @@

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

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

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

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

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

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

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

@@ -25,6 +24,7 @@

#include "ui/base/dragdrop/os_exchange_data.h"

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

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

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

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

#include "ui/views/controls/menu/menu_item_view.h"

#include "ui/views/controls/menu/submenu_view.h"

@@ -131,7 +131,7 @@

selection.push_back(node);

chrome::OpenAll(parent_->GetNativeWindow(), page_navigator_, selection,

- chrome::DispositionFromEventFlags(mouse_event_flags),

+ ui::DispositionFromEventFlags(mouse_event_flags),

profile_);

bookmark_utils::RecordBookmarkLaunch(location_);

}

@@ -139,7 +139,7 @@

bool BookmarkMenuDelegate::ShouldExecuteCommandWithoutClosingMenu(

int id, const ui::Event& event) {

return (event.flags() & ui::EF_LEFT_MOUSE_BUTTON) &&

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

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

}

bool BookmarkMenuDelegate::GetDropFormats(