chrome/browser/ui/views/location_bar/action_box_button_view.cc - Issue 15949029: Use a direct include of utf_string_conversions.h in chrome/browser/ui/, part 2.

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/location_bar/action_box_button_view.cc

Issue 15949029: Use a direct include of utf_string_conversions.h in chrome/browser/ui/, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 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

« no previous file with comments | « chrome/browser/ui/views/javascript_app_modal_dialog_views.cc ('k') | chrome/browser/ui/views/location_bar/content_setting_image_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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/location_bar/action_box_button_view.h"	5 #include "chrome/browser/ui/views/location_bar/action_box_button_view.h"

6	6

7 #include "base/utf_string_conversions.h"	7 #include "base/strings/utf_string_conversions.h"

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

9 #include "chrome/browser/ui/toolbar/action_box_menu_model.h"	9 #include "chrome/browser/ui/toolbar/action_box_menu_model.h"

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

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

12 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"	12 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"

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

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

15 #include "ui/base/accessibility/accessible_view_state.h"	15 #include "ui/base/accessibility/accessible_view_state.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"

(...skipping 32 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
50	50

51 void ActionBoxButtonView::OnMenuButtonClicked(View* source,	51 void ActionBoxButtonView::OnMenuButtonClicked(View* source,

52 const gfx::Point& point) {	52 const gfx::Point& point) {

53 controller_.OnButtonClicked();	53 controller_.OnButtonClicked();

54 }	54 }

55	55

56 void ActionBoxButtonView::ShowMenu(scoped_ptr<ActionBoxMenuModel> menu_model) {	56 void ActionBoxButtonView::ShowMenu(scoped_ptr<ActionBoxMenuModel> menu_model) {

57 menu_ = ActionBoxMenu::Create(browser_, menu_model.Pass());	57 menu_ = ActionBoxMenu::Create(browser_, menu_model.Pass());

58 menu_->RunMenu(this, menu_offset_);	58 menu_->RunMenu(this, menu_offset_);

59 }	59 }

OLD	NEW