Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(380)

Side by Side Diff: chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm

Issue 10533086: Action box menu (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Action box menu Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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"
(...skipping 809 matching lines...) Expand 10 before | Expand all | Expand 10 after
820 return selected_tab->restore_tab_helper()->session_id().id(); 820 return selected_tab->restore_tab_helper()->session_id().id();
821 } 821 }
822 822
823 #pragma mark - 823 #pragma mark -
824 #pragma mark Testing Methods 824 #pragma mark Testing Methods
825 825
826 - (NSButton*)buttonWithIndex:(NSUInteger)index { 826 - (NSButton*)buttonWithIndex:(NSUInteger)index {
827 if (profile_->IsOffTheRecord()) 827 if (profile_->IsOffTheRecord())
828 index = toolbarModel_->IncognitoIndexToOriginal(index); 828 index = toolbarModel_->IncognitoIndexToOriginal(index);
829 if (index < toolbarModel_->size()) { 829 if (index < toolbarModel_->size()) {
830 const Extension* extension = toolbarModel_->GetExtensionByIndex(index); 830 const Extension* extension = toolbarModel_->toolbar_item_by_index(index);
831 return [buttons_ objectForKey:base::SysUTF8ToNSString(extension->id())]; 831 return [buttons_ objectForKey:base::SysUTF8ToNSString(extension->id())];
832 } 832 }
833 return nil; 833 return nil;
834 } 834 }
835 835
836 @end 836 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698