chrome/browser/ui/views/location_bar/page_action_image_view.cc - Issue 6204002: Carnitas: Remove chrome/browser/views, update references.

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 6204002: Carnitas: Remove chrome/browser/views, update references. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Yay, more syncing Created 9 years, 11 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/page_action_image_view.h ('k') | chrome/browser/ui/views/location_bar/page_action_with_badge_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) 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/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/utf_string_conversions.h"

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

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

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

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

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

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

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

15 #include "chrome/common/extensions/extension_action.h"	15 #include "chrome/common/extensions/extension_action.h"

16 #include "chrome/common/extensions/extension_resource.h"	16 #include "chrome/common/extensions/extension_resource.h"

17 #include "views/controls/menu/menu_2.h"	17 #include "views/controls/menu/menu_2.h"

18	18

19 PageActionImageView::PageActionImageView(LocationBarView* owner,	19 PageActionImageView::PageActionImageView(LocationBarView* owner,

20 Profile* profile,	20 Profile* profile,

21 ExtensionAction* page_action)	21 ExtensionAction* page_action)

22 : owner_(owner),	22 : owner_(owner),

23 profile_(profile),	23 profile_(profile),

(...skipping 213 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
237 void PageActionImageView::ExtensionPopupIsClosing(ExtensionPopup* popup) {	237 void PageActionImageView::ExtensionPopupIsClosing(ExtensionPopup* popup) {

238 DCHECK_EQ(popup_, popup);	238 DCHECK_EQ(popup_, popup);

239 // ExtensionPopup is ref-counted, so we don't need to delete it.	239 // ExtensionPopup is ref-counted, so we don't need to delete it.

240 popup_ = NULL;	240 popup_ = NULL;

241 }	241 }

242	242

243 void PageActionImageView::HidePopup() {	243 void PageActionImageView::HidePopup() {

244 if (popup_)	244 if (popup_)

245 popup_->Close();	245 popup_->Close();

246 }	246 }

OLD	NEW