diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-19 03:52:11 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-19 03:52:11 +0000 |
commit | 1a6b30a619cba771cb9c4ed4da9c3778634567ad (patch) | |
tree | 4ced69ac8eb511a6f9bc7949348551ee62b57989 /chrome/browser/cocoa/infobar_controller.mm | |
parent | a8815b3277284778247545728bc41a077ff55b43 (diff) | |
download | chromium_src-1a6b30a619cba771cb9c4ed4da9c3778634567ad.zip chromium_src-1a6b30a619cba771cb9c4ed4da9c3778634567ad.tar.gz chromium_src-1a6b30a619cba771cb9c4ed4da9c3778634567ad.tar.bz2 |
This changelist represents the necessary merger of two others:
http://codereview.chromium.org/172082
Create new event_utils.h file for Cocoa-specific event to WindowOpenDisposition
cracking.
Hook this up to BookmarkBarController so that clicks to bookmark items use the
oracle function to determine where the bookmark should be opened.
BUG=17301
TEST=Cmd+Click etc on bookmark items should work. See bug and unit test
attached.
http://codereview.chromium.org/174021
Convert users of the "get last active browser, get selected tab contents, open
url" pattern to just call OpenURL on Browser directly.
Makes GetOrCreateTabbedBrowser public on Browser, and makes it static so it can
be called with a provided profile.
BUG=none
TEST=Try opening links from the bookmark/history menus on mac, with and without
an existing window open, with an active incognito window, etc. The links should
all open in the last active non-incognito window, or create a new non-incognito
window if none is open.
Review URL: http://codereview.chromium.org/173044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23693 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/infobar_controller.mm')
-rw-r--r-- | chrome/browser/cocoa/infobar_controller.mm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/cocoa/infobar_controller.mm b/chrome/browser/cocoa/infobar_controller.mm index ea496de..8e4affe 100644 --- a/chrome/browser/cocoa/infobar_controller.mm +++ b/chrome/browser/cocoa/infobar_controller.mm @@ -7,11 +7,11 @@ #include "base/logging.h" // for NOTREACHED() #include "base/mac_util.h" #include "base/sys_string_conversions.h" +#include "chrome/browser/cocoa/event_utils.h" #include "chrome/browser/cocoa/infobar.h" #import "chrome/browser/cocoa/infobar_container_controller.h" #import "chrome/browser/cocoa/infobar_controller.h" #include "chrome/browser/tab_contents/tab_contents.h" -#import "chrome/common/cocoa_utils.h" #include "skia/ext/skia_utils_mac.h" #include "webkit/glue/window_open_disposition.h" @@ -177,8 +177,8 @@ // is called by the InfobarTextField on its delegate (the // LinkInfoBarController). - (void)linkClicked { - WindowOpenDisposition disposition = event_utils::DispositionFromEventFlags( - [[NSApp currentEvent] modifierFlags]); + WindowOpenDisposition disposition = + event_utils::WindowOpenDispositionFromNSEvent([NSApp currentEvent]); if (delegate_->AsLinkInfoBarDelegate()->LinkClicked(disposition)) [self closeInfoBar]; } |