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 #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 "base/nsimage_cache_mac.h" | 10 #include "base/nsimage_cache_mac.h" |
11 #include "base/sys_string_conversions.h" | 11 #include "base/sys_string_conversions.h" |
12 #include "chrome/browser/browser.h" | 12 #include "chrome/browser/browser.h" |
13 #include "chrome/browser/pref_service.h" | 13 #include "chrome/browser/pref_service.h" |
14 #import "chrome/browser/cocoa/extensions/browser_action_button.h" | 14 #import "chrome/browser/cocoa/extensions/browser_action_button.h" |
15 #import "chrome/browser/cocoa/extensions/browser_actions_container_view.h" | 15 #import "chrome/browser/cocoa/extensions/browser_actions_container_view.h" |
16 #import "chrome/browser/cocoa/extensions/extension_popup_controller.h" | 16 #import "chrome/browser/cocoa/extensions/extension_popup_controller.h" |
| 17 #import "chrome/browser/cocoa/extensions/chevron_menu_button.h" |
17 #import "chrome/browser/cocoa/menu_button.h" | 18 #import "chrome/browser/cocoa/menu_button.h" |
18 #include "chrome/browser/extensions/extension_browser_event_router.h" | 19 #include "chrome/browser/extensions/extension_browser_event_router.h" |
19 #include "chrome/browser/extensions/extension_host.h" | 20 #include "chrome/browser/extensions/extension_host.h" |
20 #include "chrome/browser/extensions/extension_toolbar_model.h" | 21 #include "chrome/browser/extensions/extension_toolbar_model.h" |
21 #include "chrome/browser/extensions/extensions_service.h" | 22 #include "chrome/browser/extensions/extensions_service.h" |
22 #include "chrome/browser/profile.h" | 23 #include "chrome/browser/profile.h" |
23 #include "chrome/browser/tab_contents/tab_contents.h" | 24 #include "chrome/browser/tab_contents/tab_contents.h" |
24 #include "chrome/common/extensions/extension_action.h" | 25 #include "chrome/common/extensions/extension_action.h" |
25 #include "chrome/common/notification_observer.h" | 26 #include "chrome/common/notification_observer.h" |
26 #include "chrome/common/notification_registrar.h" | 27 #include "chrome/common/notification_registrar.h" |
(...skipping 741 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
768 [chevronMenuButton_ setFrame:buttonFrame]; | 769 [chevronMenuButton_ setFrame:buttonFrame]; |
769 } | 770 } |
770 | 771 |
771 - (void)setChevronHidden:(BOOL)hidden | 772 - (void)setChevronHidden:(BOOL)hidden |
772 inFrame:(NSRect)frame | 773 inFrame:(NSRect)frame |
773 animate:(BOOL)animate { | 774 animate:(BOOL)animate { |
774 if (hidden == [self chevronIsHidden]) | 775 if (hidden == [self chevronIsHidden]) |
775 return; | 776 return; |
776 | 777 |
777 if (!chevronMenuButton_.get()) { | 778 if (!chevronMenuButton_.get()) { |
778 chevronMenuButton_.reset([[MenuButton alloc] init]); | 779 chevronMenuButton_.reset([[ChevronMenuButton alloc] init]); |
779 [chevronMenuButton_ setBordered:NO]; | 780 [chevronMenuButton_ setBordered:NO]; |
780 [chevronMenuButton_ setShowsBorderOnlyWhileMouseInside:YES]; | 781 [chevronMenuButton_ setShowsBorderOnlyWhileMouseInside:YES]; |
781 NSImage* chevronImage = nsimage_cache::ImageNamed(kOverflowChevronsName); | 782 NSImage* chevronImage = nsimage_cache::ImageNamed(kOverflowChevronsName); |
782 [chevronMenuButton_ setImage:chevronImage]; | 783 [chevronMenuButton_ setImage:chevronImage]; |
783 [containerView_ addSubview:chevronMenuButton_]; | 784 [containerView_ addSubview:chevronMenuButton_]; |
784 } | 785 } |
785 | 786 |
786 if (!hidden) | 787 if (!hidden) |
787 [self updateOverflowMenu]; | 788 [self updateOverflowMenu]; |
788 | 789 |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
857 if (profile_->IsOffTheRecord()) | 858 if (profile_->IsOffTheRecord()) |
858 index = toolbarModel_->IncognitoIndexToOriginal(index); | 859 index = toolbarModel_->IncognitoIndexToOriginal(index); |
859 if (index < toolbarModel_->size()) { | 860 if (index < toolbarModel_->size()) { |
860 Extension* extension = toolbarModel_->GetExtensionByIndex(index); | 861 Extension* extension = toolbarModel_->GetExtensionByIndex(index); |
861 return [buttons_ objectForKey:base::SysUTF8ToNSString(extension->id())]; | 862 return [buttons_ objectForKey:base::SysUTF8ToNSString(extension->id())]; |
862 } | 863 } |
863 return nil; | 864 return nil; |
864 } | 865 } |
865 | 866 |
866 @end | 867 @end |
OLD | NEW |