| OLD | NEW | 
|---|
| 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/extensions/extension_action_context_menu.h" | 5 #include "chrome/browser/views/extensions/extension_action_context_menu.h" | 
| 6 | 6 | 
| 7 #include "chrome/browser/browser.h" | 7 #include "chrome/browser/browser.h" | 
| 8 #include "chrome/browser/browser_list.h" | 8 #include "chrome/browser/browser_list.h" | 
| 9 #include "chrome/browser/extensions/extensions_service.h" | 9 #include "chrome/browser/extensions/extensions_service.h" | 
| 10 #include "chrome/browser/profile.h" | 10 #include "chrome/browser/profile.h" | 
| 11 | 11 | 
| 12 ExtensionActionContextMenu::ExtensionActionContextMenu() | 12 ExtensionActionContextMenu::ExtensionActionContextMenu() | 
| 13   : extension_(NULL) { | 13   : extension_(NULL) { | 
| 14 } | 14 } | 
| 15 | 15 | 
| 16 ExtensionActionContextMenu::~ExtensionActionContextMenu() { | 16 ExtensionActionContextMenu::~ExtensionActionContextMenu() { | 
| 17 } | 17 } | 
| 18 | 18 | 
| 19 void ExtensionActionContextMenu::Run(Extension* extension, | 19 void ExtensionActionContextMenu::Run(Extension* extension, | 
| 20                                      const gfx::Point& point) { | 20     ExtensionAction* extension_action, | 
|  | 21     ExtensionActionContextMenuModel::MenuDelegate* delegate, | 
|  | 22     PrefService* prefs, | 
|  | 23     const gfx::Point& point) { | 
| 21   extension_ = extension; | 24   extension_ = extension; | 
| 22 | 25 | 
| 23   context_menu_contents_.reset( | 26   context_menu_contents_.reset( | 
| 24       new ExtensionActionContextMenuModel(extension)); | 27       new ExtensionActionContextMenuModel(extension, extension_action, prefs, | 
|  | 28                                           delegate)); | 
| 25   context_menu_menu_.reset(new views::Menu2(context_menu_contents_.get())); | 29   context_menu_menu_.reset(new views::Menu2(context_menu_contents_.get())); | 
| 26   // This call blocks until the menu is dismissed or something is selected. | 30   // This call blocks until the menu is dismissed or something is selected. | 
| 27   context_menu_menu_->RunContextMenuAt(point); | 31   context_menu_menu_->RunContextMenuAt(point); | 
| 28 } | 32 } | 
| 29 | 33 | 
| 30 void ExtensionActionContextMenu::Cancel() { | 34 void ExtensionActionContextMenu::Cancel() { | 
| 31   if (context_menu_menu_.get()) | 35   if (context_menu_menu_.get()) | 
| 32     context_menu_menu_->CancelMenu(); | 36     context_menu_menu_->CancelMenu(); | 
| 33 } | 37 } | 
| OLD | NEW | 
|---|