chrome/browser/ui/views/location_bar/page_action_image_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/page_action_image_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/location_bar/location_icon_view.cc ('k') | chrome/browser/ui/views/location_bar/selected_keyword_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/page_action_image_view.h"	5 #include "chrome/browser/ui/views/location_bar/page_action_image_view.h"

6	6

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

8 #include "chrome/browser/extensions/api/commands/command_service.h"	8 #include "chrome/browser/extensions/api/commands/command_service.h"

9 #include "chrome/browser/extensions/extension_action.h"	9 #include "chrome/browser/extensions/extension_action.h"

10 #include "chrome/browser/extensions/extension_action_icon_factory.h"	10 #include "chrome/browser/extensions/extension_action_icon_factory.h"

11 #include "chrome/browser/extensions/extension_action_manager.h"	11 #include "chrome/browser/extensions/extension_action_manager.h"

12 #include "chrome/browser/extensions/extension_context_menu_model.h"	12 #include "chrome/browser/extensions/extension_context_menu_model.h"

13 #include "chrome/browser/extensions/extension_service.h"	13 #include "chrome/browser/extensions/extension_service.h"

14 #include "chrome/browser/extensions/extension_tab_util.h"	14 #include "chrome/browser/extensions/extension_tab_util.h"

15 #include "chrome/browser/extensions/location_bar_controller.h"	15 #include "chrome/browser/extensions/location_bar_controller.h"

16 #include "chrome/browser/extensions/tab_helper.h"	16 #include "chrome/browser/extensions/tab_helper.h"

17 #include "chrome/browser/platform_util.h"	17 #include "chrome/browser/platform_util.h"

(...skipping 258 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
276	276

277 popup_ = ExtensionPopup::ShowPopup(popup_url, browser_, this, arrow,	277 popup_ = ExtensionPopup::ShowPopup(popup_url, browser_, this, arrow,

278 show_action);	278 show_action);

279 popup_->GetWidget()->AddObserver(this);	279 popup_->GetWidget()->AddObserver(this);

280 }	280 }

281	281

282 void PageActionImageView::HidePopup() {	282 void PageActionImageView::HidePopup() {

283 if (popup_)	283 if (popup_)

284 popup_->GetWidget()->Close();	284 popup_->GetWidget()->Close();

285 }	285 }

OLD	NEW