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

Side by Side Diff: chrome/browser/ui/views/compact_nav/compact_navigation_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_location_bar_view.cc ('k') | chrome/browser/ui/views/compact_nav/compact_options_bar.cc » ('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_navigation_bar.h"	5 #include "chrome/browser/ui/views/compact_nav/compact_navigation_bar.h"

6	6

7 #include "base/logging.h"	7 #include "base/logging.h"

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

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

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

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

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

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

13 #include "chrome/browser/ui/toolbar/back_forward_menu_model.h"	14 #include "chrome/browser/ui/toolbar/back_forward_menu_model.h"

14 #include "chrome/browser/ui/view_ids.h"	15 #include "chrome/browser/ui/view_ids.h"

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

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

17 #include "chrome/browser/ui/views/theme_background.h"	17 #include "chrome/browser/ui/views/theme_background.h"

18 #include "content/browser/tab_contents/tab_contents.h"	18 #include "content/browser/tab_contents/tab_contents.h"

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

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

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

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

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

24 #include "ui/base/theme_provider.h"	24 #include "ui/base/theme_provider.h"

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

(...skipping 151 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
177	177

178 forward_->SetImage(views::CustomButton::BS_NORMAL,	178 forward_->SetImage(views::CustomButton::BS_NORMAL,

179 tp->GetBitmapNamed(IDR_FORWARD));	179 tp->GetBitmapNamed(IDR_FORWARD));

180 forward_->SetImage(views::CustomButton::BS_HOT,	180 forward_->SetImage(views::CustomButton::BS_HOT,

181 tp->GetBitmapNamed(IDR_FORWARD_H));	181 tp->GetBitmapNamed(IDR_FORWARD_H));

182 forward_->SetImage(views::CustomButton::BS_PUSHED,	182 forward_->SetImage(views::CustomButton::BS_PUSHED,

183 tp->GetBitmapNamed(IDR_FORWARD_P));	183 tp->GetBitmapNamed(IDR_FORWARD_P));

184 forward_->SetImage(views::CustomButton::BS_DISABLED,	184 forward_->SetImage(views::CustomButton::BS_DISABLED,

185 tp->GetBitmapNamed(IDR_FORWARD_D));	185 tp->GetBitmapNamed(IDR_FORWARD_D));

186 }	186 }

OLD	NEW