chrome/browser/ui/views/compact_nav/compact_options_bar.cc - Issue 6893046: added CTRL+Click and SHIFT+Click handler for context menu, Back and Forward.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/ui/views/compact_nav/compact_options_bar.cc

Issue 6893046: added CTRL+Click and SHIFT+Click handler for context menu, Back and Forward. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: make event_utils::DispositionFromEventFlags not view-specific. Created 9 years, 6 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 unified diff | Download patch | Annotate | Revision Log

« chrome/browser/ui/tab_contents/tab_contents_wrapper_delegate.h ('K') | « chrome/browser/ui/views/compact_nav/compact_navigation_bar.cc ('k') | chrome/browser/ui/views/event_utils.h » ('j') | ui/base/models/menu_model.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/ui/views/compact_nav/compact_options_bar.h"	5 #include "chrome/browser/ui/views/compact_nav/compact_options_bar.h"

6	6

7 #include "chrome/app/chrome_command_ids.h"	7 #include "chrome/app/chrome_command_ids.h"

	8 #include "chrome/browser/ui/event_disposition_utils.h"

8 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"	9 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"

9 #include "chrome/browser/ui/view_ids.h"	10 #include "chrome/browser/ui/view_ids.h"

10 #include "chrome/browser/ui/views/event_utils.h"

11 #include "chrome/browser/ui/views/frame/browser_view.h"	11 #include "chrome/browser/ui/views/frame/browser_view.h"

12 #include "chrome/browser/ui/views/toolbar_view.h"	12 #include "chrome/browser/ui/views/toolbar_view.h"

13 #include "chrome/browser/ui/views/wrench_menu.h"	13 #include "chrome/browser/ui/views/wrench_menu.h"

14 #include "grit/chromium_strings.h"	14 #include "grit/chromium_strings.h"

15 #include "grit/generated_resources.h"	15 #include "grit/generated_resources.h"

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

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

18 #include "ui/gfx/canvas.h"	18 #include "ui/gfx/canvas.h"

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

20	20

(...skipping 121 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
142 void CompactOptionsBar::LoadImages() {	142 void CompactOptionsBar::LoadImages() {

143 // Reuse the resources loaded for the Toolbar's AppMenu.	143 // Reuse the resources loaded for the Toolbar's AppMenu.

144 DCHECK(browser_view_->toolbar());	144 DCHECK(browser_view_->toolbar());

145 app_menu_->SetIcon(browser_view_->toolbar()->GetAppMenuIcon(	145 app_menu_->SetIcon(browser_view_->toolbar()->GetAppMenuIcon(

146 views::CustomButton::BS_NORMAL));	146 views::CustomButton::BS_NORMAL));

147 app_menu_->SetHoverIcon(browser_view_->toolbar()->GetAppMenuIcon(	147 app_menu_->SetHoverIcon(browser_view_->toolbar()->GetAppMenuIcon(

148 views::CustomButton::BS_HOT));	148 views::CustomButton::BS_HOT));

149 app_menu_->SetPushedIcon(browser_view_->toolbar()->GetAppMenuIcon(	149 app_menu_->SetPushedIcon(browser_view_->toolbar()->GetAppMenuIcon(

150 views::CustomButton::BS_PUSHED));	150 views::CustomButton::BS_PUSHED));

151 }	151 }

OLD	NEW