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

Side by Side Diff: chrome/browser/cocoa/browser_window_controller.mm

Issue 206030: disable extension bar for now (Closed)
Patch Set: Created 11 years, 3 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 #include <Carbon/Carbon.h> 5 #include <Carbon/Carbon.h>
6 6
7 #include "base/mac_util.h" 7 #include "base/mac_util.h"
8 #include "base/scoped_nsdisable_screen_updates.h" 8 #include "base/scoped_nsdisable_screen_updates.h"
9 #import "base/scoped_nsobject.h" 9 #import "base/scoped_nsobject.h"
10 #include "base/sys_string_conversions.h" 10 #include "base/sys_string_conversions.h"
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 browser:browser 183 browser:browser
184 resizeDelegate:self 184 resizeDelegate:self
185 bookmarkDelegate:self]); 185 bookmarkDelegate:self]);
186 // If we are a pop-up, we have a titlebar and no toolbar. 186 // If we are a pop-up, we have a titlebar and no toolbar.
187 if (!browser_->SupportsWindowFeature(Browser::FEATURE_TOOLBAR) && 187 if (!browser_->SupportsWindowFeature(Browser::FEATURE_TOOLBAR) &&
188 browser_->SupportsWindowFeature(Browser::FEATURE_TITLEBAR)) { 188 browser_->SupportsWindowFeature(Browser::FEATURE_TITLEBAR)) {
189 [toolbarController_ setHasToolbar:NO]; 189 [toolbarController_ setHasToolbar:NO];
190 } 190 }
191 [[[self window] contentView] addSubview:[toolbarController_ view]]; 191 [[[self window] contentView] addSubview:[toolbarController_ view]];
192 192
193 if (browser_->SupportsWindowFeature(Browser::FEATURE_EXTENSIONSHELF)) { 193 // TODO(thakis): Turn this back on when the extension bar doesn't show up
194 // Create the extension shelf. 194 // if you don't have toolstrips installed.
195 extensionShelfController_.reset([[ExtensionShelfController alloc] 195 // if (browser_->SupportsWindowFeature(Browser::FEATURE_EXTENSIONSHELF)) {
pink (ping after 24hrs) 2009/09/16 16:21:56 this should be #if 0 rather than commenting out ea
196 initWithBrowser:browser_.get() 196 // // Create the extension shelf.
197 resizeDelegate:self]); 197 // extensionShelfController_.reset([[ExtensionShelfController alloc]
198 [[[self window] contentView] addSubview:[extensionShelfController_ view]]; 198 // initWithBrowser:browser_.get()
199 [extensionShelfController_ wasInsertedIntoWindow]; 199 // resizeDelegate:self]);
200 [extensionShelfController_ show:nil]; 200 // [[[self window] contentView] addSubview:[extensionShelfController_ view] ];
201 } 201 // [extensionShelfController_ wasInsertedIntoWindow];
202 // [extensionShelfController_ show:nil];
203 // }
202 204
203 [self fixWindowGradient]; 205 [self fixWindowGradient];
204 206
205 // Force a relayout of all the various bars. 207 // Force a relayout of all the various bars.
206 [self layoutSubviews]; 208 [self layoutSubviews];
207 209
208 // Create the bridge for the status bubble. 210 // Create the bridge for the status bubble.
209 statusBubble_.reset(new StatusBubbleMac([self window], self)); 211 statusBubble_.reset(new StatusBubbleMac([self window], self));
210 212
211 #if 0 213 #if 0
(...skipping 1197 matching lines...) Expand 10 before | Expand all | Expand 10 after
1409 provider->GetNSColor(BrowserThemeProvider::COLOR_TOOLBAR); 1411 provider->GetNSColor(BrowserThemeProvider::COLOR_TOOLBAR);
1410 [theme setValue:toolbarBackgroundColor 1412 [theme setValue:toolbarBackgroundColor
1411 forAttribute:@"backgroundColor" 1413 forAttribute:@"backgroundColor"
1412 style:GTMThemeStyleToolBar 1414 style:GTMThemeStyleToolBar
1413 state:GTMThemeStateActiveWindow]; 1415 state:GTMThemeStateActiveWindow];
1414 1416
1415 return theme; 1417 return theme;
1416 } 1418 }
1417 @end 1419 @end
1418 1420
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698