Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(53)

Side by Side Diff: chrome/browser/ui/views/location_bar/page_action_image_view.cc

Issue 547303003: Keep reference view pressed while extension actions have a popup (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: VIEWS_EXPORT fix Created 6 years, 2 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
OLDNEW
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/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/browser/extensions/extension_action.h" 8 #include "chrome/browser/extensions/extension_action.h"
9 #include "chrome/browser/platform_util.h" 9 #include "chrome/browser/platform_util.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 140
141 ExtensionActionViewController* 141 ExtensionActionViewController*
142 PageActionImageView::GetPreferredPopupViewController() { 142 PageActionImageView::GetPreferredPopupViewController() {
143 return view_controller_.get(); 143 return view_controller_.get();
144 } 144 }
145 145
146 views::View* PageActionImageView::GetReferenceViewForPopup() { 146 views::View* PageActionImageView::GetReferenceViewForPopup() {
147 return this; 147 return this;
148 } 148 }
149 149
150 views::MenuButton* PageActionImageView::GetContextMenuButton() {
151 return NULL; // No menu button for page action views.
152 }
153
150 content::WebContents* PageActionImageView::GetCurrentWebContents() { 154 content::WebContents* PageActionImageView::GetCurrentWebContents() {
151 return owner_->GetWebContents(); 155 return owner_->GetWebContents();
152 } 156 }
153 157
154 void PageActionImageView::HideActivePopup() { 158 void PageActionImageView::HideActivePopup() {
155 // The only popup that will be active is this popup. 159 // The only popup that will be active is this popup.
156 view_controller_->HidePopup(); 160 view_controller_->HidePopup();
157 } 161 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/location_bar/page_action_image_view.h ('k') | chrome/browser/ui/views/toolbar/browser_action_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698