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

Side by Side Diff: chrome/browser/ui/views/toolbar_view.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

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/toolbar_view.h"	5 #include "chrome/browser/ui/views/toolbar_view.h"

6	6

7 #include "base/i18n/number_formatting.h"	7 #include "base/i18n/number_formatting.h"

8 #include "base/utf_string_conversions.h"	8 #include "base/utf_string_conversions.h"

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

10 #include "chrome/browser/accessibility/browser_accessibility_state.h"	10 #include "chrome/browser/accessibility/browser_accessibility_state.h"

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

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

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

14 #include "chrome/browser/ui/browser_window.h"	14 #include "chrome/browser/ui/browser_window.h"

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

15 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"	16 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"

16 #include "chrome/browser/ui/view_ids.h"	17 #include "chrome/browser/ui/view_ids.h"

17 #include "chrome/browser/ui/views/browser_actions_container.h"	18 #include "chrome/browser/ui/views/browser_actions_container.h"

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

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

20 #include "chrome/browser/upgrade_detector.h"	20 #include "chrome/browser/upgrade_detector.h"

21 #include "chrome/common/pref_names.h"	21 #include "chrome/common/pref_names.h"

22 #include "content/browser/user_metrics.h"	22 #include "content/browser/user_metrics.h"

23 #include "content/common/notification_service.h"	23 #include "content/common/notification_service.h"

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

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

26 #include "grit/theme_resources.h"	26 #include "grit/theme_resources.h"

27 #include "grit/theme_resources_standard.h"	27 #include "grit/theme_resources_standard.h"

28 #include "ui/base/accessibility/accessible_view_state.h"	28 #include "ui/base/accessibility/accessible_view_state.h"

(...skipping 654 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
683 app_menu_->SetHoverIcon(GetAppMenuIcon(views::CustomButton::BS_HOT));	683 app_menu_->SetHoverIcon(GetAppMenuIcon(views::CustomButton::BS_HOT));

684 app_menu_->SetPushedIcon(GetAppMenuIcon(views::CustomButton::BS_PUSHED));	684 app_menu_->SetPushedIcon(GetAppMenuIcon(views::CustomButton::BS_PUSHED));

685 }	685 }

686	686

687 void ToolbarView::UpdateAppMenuBadge() {	687 void ToolbarView::UpdateAppMenuBadge() {

688 app_menu_->SetIcon(GetAppMenuIcon(views::CustomButton::BS_NORMAL));	688 app_menu_->SetIcon(GetAppMenuIcon(views::CustomButton::BS_NORMAL));

689 app_menu_->SetHoverIcon(GetAppMenuIcon(views::CustomButton::BS_HOT));	689 app_menu_->SetHoverIcon(GetAppMenuIcon(views::CustomButton::BS_HOT));

690 app_menu_->SetPushedIcon(GetAppMenuIcon(views::CustomButton::BS_PUSHED));	690 app_menu_->SetPushedIcon(GetAppMenuIcon(views::CustomButton::BS_PUSHED));

691 SchedulePaint();	691 SchedulePaint();

692 }	692 }

OLD	NEW