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

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

Issue 5606002: Move:... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years 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
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/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/extensions_service.h" 10 #include "chrome/browser/extensions/extensions_service.h"
11 #include "chrome/browser/profile.h" 11 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/views/frame/browser_view.h" 12 #include "chrome/browser/views/frame/browser_view.h"
13 #include "chrome/browser/views/location_bar/location_bar_view.h" 13 #include "chrome/browser/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)
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 void PageActionImageView::ExtensionPopupIsClosing(ExtensionPopup* popup) { 234 void PageActionImageView::ExtensionPopupIsClosing(ExtensionPopup* popup) {
235 DCHECK_EQ(popup_, popup); 235 DCHECK_EQ(popup_, popup);
236 // ExtensionPopup is ref-counted, so we don't need to delete it. 236 // ExtensionPopup is ref-counted, so we don't need to delete it.
237 popup_ = NULL; 237 popup_ = NULL;
238 } 238 }
239 239
240 void PageActionImageView::HidePopup() { 240 void PageActionImageView::HidePopup() {
241 if (popup_) 241 if (popup_)
242 popup_->Close(); 242 popup_->Close();
243 } 243 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698