diff options
| author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-19 22:52:58 +0000 |
|---|---|---|
| committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-19 22:52:58 +0000 |
| commit | 97136e4e88cd9a2dd1d012121a431c19581679ab (patch) | |
| tree | d0300d8ed0489e1ddefbf46e3e9831ce42dcb3ea /ash/launcher/launcher_view.cc | |
| parent | 8aae5992950d6a932fb91a4f6515af88d06c22c7 (diff) | |
| download | chromium_src-97136e4e88cd9a2dd1d012121a431c19581679ab.zip chromium_src-97136e4e88cd9a2dd1d012121a431c19581679ab.tar.gz chromium_src-97136e4e88cd9a2dd1d012121a431c19581679ab.tar.bz2 | |
cros: Unify Chrome icon behavior on launcher bar and app list.
- Merge CreateNewTab and CreateNewWindow into OnBrowserShortcutClicked and make it to
refocus the last used browser window and create one if there is no last used window;
- Use ChromeLauncherController code to "open" Chrome app from app list;
- Add context menu for Chrome app in app list;
BUG=154523
TEST=Verify both chrome icons refocus last used browser window and have similar context menus.
R=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11190057
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163086 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/launcher/launcher_view.cc')
| -rw-r--r-- | ash/launcher/launcher_view.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/ash/launcher/launcher_view.cc b/ash/launcher/launcher_view.cc index f346c69..64676ec 100644 --- a/ash/launcher/launcher_view.cc +++ b/ash/launcher/launcher_view.cc @@ -1022,10 +1022,7 @@ void LauncherView::ButtonPressed(views::Button* sender, Shell::GetInstance()->delegate()->RecordUserMetricsAction( UMA_LAUNCHER_CLICK_ON_APP); - if (event.flags() & ui::EF_CONTROL_DOWN) - delegate_->CreateNewWindow(); - else - delegate_->CreateNewTab(); + delegate_->OnBrowserShortcutClicked(event.flags()); break; } if (event.IsShiftDown()) |