| 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 "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/sys_string_conversions.h" | 10 #include "base/sys_string_conversions.h" |
| 11 #include "chrome/browser/extensions/extension_action.h" | 11 #include "chrome/browser/extensions/extension_action.h" |
| 12 #include "chrome/browser/extensions/extension_action_manager.h" | 12 #include "chrome/browser/extensions/extension_action_manager.h" |
| 13 #include "chrome/browser/extensions/extension_service.h" | 13 #include "chrome/browser/extensions/extension_service.h" |
| 14 #include "chrome/browser/extensions/extension_system.h" |
| 14 #include "chrome/browser/extensions/extension_toolbar_model.h" | 15 #include "chrome/browser/extensions/extension_toolbar_model.h" |
| 15 #include "chrome/browser/prefs/pref_service.h" | 16 #include "chrome/browser/prefs/pref_service.h" |
| 16 #include "chrome/browser/profiles/profile.h" | 17 #include "chrome/browser/profiles/profile.h" |
| 17 #include "chrome/browser/sessions/session_tab_helper.h" | 18 #include "chrome/browser/sessions/session_tab_helper.h" |
| 18 #include "chrome/browser/ui/browser.h" | 19 #include "chrome/browser/ui/browser.h" |
| 19 #include "chrome/browser/ui/browser_tabstrip.h" | 20 #include "chrome/browser/ui/browser_tabstrip.h" |
| 20 #include "chrome/browser/ui/browser_window.h" | 21 #include "chrome/browser/ui/browser_window.h" |
| 21 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h" | 22 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h" |
| 22 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h" | 23 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h" |
| 23 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h" | 24 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h" |
| (...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 261 | 262 |
| 262 if ((self = [super init])) { | 263 if ((self = [super init])) { |
| 263 browser_ = browser; | 264 browser_ = browser; |
| 264 profile_ = browser->profile(); | 265 profile_ = browser->profile(); |
| 265 | 266 |
| 266 if (!profile_->GetPrefs()->FindPreference( | 267 if (!profile_->GetPrefs()->FindPreference( |
| 267 prefs::kBrowserActionContainerWidth)) | 268 prefs::kBrowserActionContainerWidth)) |
| 268 [BrowserActionsController registerUserPrefs:profile_->GetPrefs()]; | 269 [BrowserActionsController registerUserPrefs:profile_->GetPrefs()]; |
| 269 | 270 |
| 270 observer_.reset(new ExtensionServiceObserverBridge(self, browser_)); | 271 observer_.reset(new ExtensionServiceObserverBridge(self, browser_)); |
| 271 ExtensionService* extensionService = profile_->GetExtensionService(); | 272 ExtensionService* extensionService = |
| 273 extensions::ExtensionSystem::Get(profile_)->extension_service(); |
| 272 // |extensionService| can be NULL in Incognito. | 274 // |extensionService| can be NULL in Incognito. |
| 273 if (extensionService) { | 275 if (extensionService) { |
| 274 toolbarModel_ = extensionService->toolbar_model(); | 276 toolbarModel_ = extensionService->toolbar_model(); |
| 275 toolbarModel_->AddObserver(observer_.get()); | 277 toolbarModel_->AddObserver(observer_.get()); |
| 276 } | 278 } |
| 277 | 279 |
| 278 containerView_ = container; | 280 containerView_ = container; |
| 279 [containerView_ setPostsFrameChangedNotifications:YES]; | 281 [containerView_ setPostsFrameChangedNotifications:YES]; |
| 280 [[NSNotificationCenter defaultCenter] | 282 [[NSNotificationCenter defaultCenter] |
| 281 addObserver:self | 283 addObserver:self |
| (...skipping 478 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 760 devMode:NO]; | 762 devMode:NO]; |
| 761 break; | 763 break; |
| 762 } | 764 } |
| 763 } | 765 } |
| 764 } | 766 } |
| 765 | 767 |
| 766 - (BOOL)shouldDisplayBrowserAction:(const Extension*)extension { | 768 - (BOOL)shouldDisplayBrowserAction:(const Extension*)extension { |
| 767 // Only display incognito-enabled extensions while in incognito mode. | 769 // Only display incognito-enabled extensions while in incognito mode. |
| 768 return | 770 return |
| 769 (!profile_->IsOffTheRecord() || | 771 (!profile_->IsOffTheRecord() || |
| 770 profile_->GetExtensionService()->IsIncognitoEnabled(extension->id())); | 772 extensions::ExtensionSystem::Get(profile_)->extension_service()-> |
| 773 IsIncognitoEnabled(extension->id())); |
| 771 } | 774 } |
| 772 | 775 |
| 773 - (void)showChevronIfNecessaryInFrame:(NSRect)frame animate:(BOOL)animate { | 776 - (void)showChevronIfNecessaryInFrame:(NSRect)frame animate:(BOOL)animate { |
| 774 [self setChevronHidden:([self buttonCount] == [self visibleButtonCount]) | 777 [self setChevronHidden:([self buttonCount] == [self visibleButtonCount]) |
| 775 inFrame:frame | 778 inFrame:frame |
| 776 animate:animate]; | 779 animate:animate]; |
| 777 } | 780 } |
| 778 | 781 |
| 779 - (void)updateChevronPositionInFrame:(NSRect)frame { | 782 - (void)updateChevronPositionInFrame:(NSRect)frame { |
| 780 CGFloat xPos = NSWidth(frame) - kChevronWidth; | 783 CGFloat xPos = NSWidth(frame) - kChevronWidth; |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 867 const extensions::ExtensionList& toolbar_items = | 870 const extensions::ExtensionList& toolbar_items = |
| 868 toolbarModel_->toolbar_items(); | 871 toolbarModel_->toolbar_items(); |
| 869 if (index < toolbar_items.size()) { | 872 if (index < toolbar_items.size()) { |
| 870 const Extension* extension = toolbar_items[index]; | 873 const Extension* extension = toolbar_items[index]; |
| 871 return [buttons_ objectForKey:base::SysUTF8ToNSString(extension->id())]; | 874 return [buttons_ objectForKey:base::SysUTF8ToNSString(extension->id())]; |
| 872 } | 875 } |
| 873 return nil; | 876 return nil; |
| 874 } | 877 } |
| 875 | 878 |
| 876 @end | 879 @end |
| OLD | NEW |