| 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 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h" | 5 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h" |
| 6 | 6 |
| 7 #include <cmath> | 7 #include <cmath> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
| 11 #include "base/strings/sys_string_conversions.h" | 11 #include "base/strings/sys_string_conversions.h" |
| 12 #include "chrome/browser/chrome_notification_types.h" | 12 #include "chrome/browser/chrome_notification_types.h" |
| 13 #include "chrome/browser/extensions/extension_action.h" | 13 #include "chrome/browser/extensions/extension_action.h" |
| 14 #include "chrome/browser/extensions/extension_action_manager.h" | 14 #include "chrome/browser/extensions/extension_action_manager.h" |
| 15 #include "chrome/browser/extensions/extension_service.h" | |
| 16 #include "chrome/browser/extensions/extension_toolbar_model.h" | 15 #include "chrome/browser/extensions/extension_toolbar_model.h" |
| 17 #include "chrome/browser/extensions/extension_util.h" | 16 #include "chrome/browser/extensions/extension_util.h" |
| 18 #include "chrome/browser/profiles/profile.h" | 17 #include "chrome/browser/profiles/profile.h" |
| 19 #include "chrome/browser/sessions/session_tab_helper.h" | 18 #include "chrome/browser/sessions/session_tab_helper.h" |
| 20 #include "chrome/browser/ui/browser.h" | 19 #include "chrome/browser/ui/browser.h" |
| 21 #include "chrome/browser/ui/browser_window.h" | 20 #include "chrome/browser/ui/browser_window.h" |
| 22 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h" | 21 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h" |
| 23 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h" | 22 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h" |
| 24 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h" | 23 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h" |
| 25 #import "chrome/browser/ui/cocoa/image_button_cell.h" | 24 #import "chrome/browser/ui/cocoa/image_button_cell.h" |
| 26 #import "chrome/browser/ui/cocoa/menu_button.h" | 25 #import "chrome/browser/ui/cocoa/menu_button.h" |
| 27 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 26 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 28 #include "chrome/common/extensions/api/extension_action/action_info.h" | 27 #include "chrome/common/extensions/api/extension_action/action_info.h" |
| 29 #include "chrome/common/pref_names.h" | 28 #include "chrome/common/pref_names.h" |
| 30 #include "content/public/browser/notification_details.h" | 29 #include "content/public/browser/notification_details.h" |
| 31 #include "content/public/browser/notification_observer.h" | 30 #include "content/public/browser/notification_observer.h" |
| 32 #include "content/public/browser/notification_registrar.h" | 31 #include "content/public/browser/notification_registrar.h" |
| 33 #include "content/public/browser/notification_source.h" | 32 #include "content/public/browser/notification_source.h" |
| 34 #include "extensions/browser/extension_system.h" | 33 #include "extensions/browser/extension_registry.h" |
| 35 #include "extensions/browser/pref_names.h" | 34 #include "extensions/browser/pref_names.h" |
| 36 #include "grit/theme_resources.h" | 35 #include "grit/theme_resources.h" |
| 37 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h
" | 36 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h
" |
| 38 | 37 |
| 39 using extensions::Extension; | 38 using extensions::Extension; |
| 40 using extensions::ExtensionList; | 39 using extensions::ExtensionList; |
| 41 | 40 |
| 42 NSString* const kBrowserActionVisibilityChangedNotification = | 41 NSString* const kBrowserActionVisibilityChangedNotification = |
| 43 @"BrowserActionVisibilityChangedNotification"; | 42 @"BrowserActionVisibilityChangedNotification"; |
| 44 | 43 |
| (...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 437 return NO; | 436 return NO; |
| 438 } else if (effect == NSViewAnimationFadeOutEffect) { | 437 } else if (effect == NSViewAnimationFadeOutEffect) { |
| 439 return YES; | 438 return YES; |
| 440 } | 439 } |
| 441 | 440 |
| 442 NOTREACHED(); | 441 NOTREACHED(); |
| 443 return YES; | 442 return YES; |
| 444 } | 443 } |
| 445 | 444 |
| 446 - (void)activateBrowserAction:(const std::string&)extension_id { | 445 - (void)activateBrowserAction:(const std::string&)extension_id { |
| 447 ExtensionService* service = browser_->profile()->GetExtensionService(); | 446 const Extension* extension = extensions::ExtensionRegistry::Get( |
| 448 if (!service) | 447 browser_->profile())->enabled_extensions().GetByID(extension_id); |
| 449 return; | |
| 450 | |
| 451 const Extension* extension = service->GetExtensionById(extension_id, false); | |
| 452 if (!extension) | 448 if (!extension) |
| 453 return; | 449 return; |
| 454 | 450 |
| 455 BrowserActionButton* button = [self buttonForExtension:extension]; | 451 BrowserActionButton* button = [self buttonForExtension:extension]; |
| 456 // |button| can be nil when the browser action has its button hidden. | 452 // |button| can be nil when the browser action has its button hidden. |
| 457 if (button) | 453 if (button) |
| 458 [self browserActionClicked:button]; | 454 [self browserActionClicked:button]; |
| 459 } | 455 } |
| 460 | 456 |
| 461 #pragma mark - | 457 #pragma mark - |
| (...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 888 const extensions::ExtensionList& toolbar_items = | 884 const extensions::ExtensionList& toolbar_items = |
| 889 toolbarModel_->toolbar_items(); | 885 toolbarModel_->toolbar_items(); |
| 890 if (index < toolbar_items.size()) { | 886 if (index < toolbar_items.size()) { |
| 891 const Extension* extension = toolbar_items[index].get(); | 887 const Extension* extension = toolbar_items[index].get(); |
| 892 return [buttons_ objectForKey:base::SysUTF8ToNSString(extension->id())]; | 888 return [buttons_ objectForKey:base::SysUTF8ToNSString(extension->id())]; |
| 893 } | 889 } |
| 894 return nil; | 890 return nil; |
| 895 } | 891 } |
| 896 | 892 |
| 897 @end | 893 @end |
| OLD | NEW |