| OLD | NEW |
| 1 // Copyright (c) 2010 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 #import "browser_actions_controller.h" | 5 #import "browser_actions_controller.h" |
| 6 | 6 |
| 7 #include <cmath> | 7 #include <cmath> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "app/mac/nsimage_cache.h" | 10 #include "app/mac/nsimage_cache.h" |
| 11 #include "base/sys_string_conversions.h" | 11 #include "base/sys_string_conversions.h" |
| 12 #include "chrome/browser/extensions/extension_browser_event_router.h" | 12 #include "chrome/browser/extensions/extension_browser_event_router.h" |
| 13 #include "chrome/browser/extensions/extension_host.h" | 13 #include "chrome/browser/extensions/extension_host.h" |
| 14 #include "chrome/browser/extensions/extension_service.h" |
| 14 #include "chrome/browser/extensions/extension_toolbar_model.h" | 15 #include "chrome/browser/extensions/extension_toolbar_model.h" |
| 15 #include "chrome/browser/extensions/extension_service.h" | |
| 16 #include "chrome/browser/prefs/pref_service.h" | 16 #include "chrome/browser/prefs/pref_service.h" |
| 17 #include "chrome/browser/profiles/profile.h" | 17 #include "chrome/browser/profiles/profile.h" |
| 18 #include "chrome/browser/ui/browser.h" | 18 #include "chrome/browser/ui/browser.h" |
| 19 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h" | 19 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h" |
| 20 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h" | 20 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h" |
| 21 #import "chrome/browser/ui/cocoa/extensions/chevron_menu_button.h" | 21 #import "chrome/browser/ui/cocoa/extensions/chevron_menu_button.h" |
| 22 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h" | 22 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h" |
| 23 #import "chrome/browser/ui/cocoa/menu_button.h" | 23 #import "chrome/browser/ui/cocoa/menu_button.h" |
| 24 #include "chrome/common/extensions/extension_action.h" | 24 #include "chrome/common/extensions/extension_action.h" |
| 25 #include "chrome/common/notification_details.h" | |
| 26 #include "chrome/common/notification_observer.h" | |
| 27 #include "chrome/common/notification_registrar.h" | |
| 28 #include "chrome/common/notification_source.h" | |
| 29 #include "chrome/common/pref_names.h" | 25 #include "chrome/common/pref_names.h" |
| 30 #include "content/browser/tab_contents/tab_contents.h" | 26 #include "content/browser/tab_contents/tab_contents.h" |
| 27 #include "content/common/notification_details.h" |
| 28 #include "content/common/notification_observer.h" |
| 29 #include "content/common/notification_registrar.h" |
| 30 #include "content/common/notification_source.h" |
| 31 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" | 31 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" |
| 32 | 32 |
| 33 NSString* const kBrowserActionVisibilityChangedNotification = | 33 NSString* const kBrowserActionVisibilityChangedNotification = |
| 34 @"BrowserActionVisibilityChangedNotification"; | 34 @"BrowserActionVisibilityChangedNotification"; |
| 35 | 35 |
| 36 namespace { | 36 namespace { |
| 37 const CGFloat kAnimationDuration = 0.2; | 37 const CGFloat kAnimationDuration = 0.2; |
| 38 | 38 |
| 39 const CGFloat kChevronWidth = 14.0; | 39 const CGFloat kChevronWidth = 14.0; |
| 40 | 40 |
| (...skipping 817 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 858 if (profile_->IsOffTheRecord()) | 858 if (profile_->IsOffTheRecord()) |
| 859 index = toolbarModel_->IncognitoIndexToOriginal(index); | 859 index = toolbarModel_->IncognitoIndexToOriginal(index); |
| 860 if (index < toolbarModel_->size()) { | 860 if (index < toolbarModel_->size()) { |
| 861 const Extension* extension = toolbarModel_->GetExtensionByIndex(index); | 861 const Extension* extension = toolbarModel_->GetExtensionByIndex(index); |
| 862 return [buttons_ objectForKey:base::SysUTF8ToNSString(extension->id())]; | 862 return [buttons_ objectForKey:base::SysUTF8ToNSString(extension->id())]; |
| 863 } | 863 } |
| 864 return nil; | 864 return nil; |
| 865 } | 865 } |
| 866 | 866 |
| 867 @end | 867 @end |
| OLD | NEW |