summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-19 19:57:17 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-19 19:57:17 +0000
commitf5ea71efa3159ebb8b7965c6f0ea2f0f1a8e3f80 (patch)
tree20a1341873ff7191bf38c47a2861017ebd78c2d6 /chrome
parent9314fbda45907b28a49522a85e0779da86e00644 (diff)
downloadchromium_src-f5ea71efa3159ebb8b7965c6f0ea2f0f1a8e3f80.zip
chromium_src-f5ea71efa3159ebb8b7965c6f0ea2f0f1a8e3f80.tar.gz
chromium_src-f5ea71efa3159ebb8b7965c6f0ea2f0f1a8e3f80.tar.bz2
Turn os x extension shelf on.
I can't reproduce the startup perf regression locally after syncing, so I will do some experiments on trunk. If this regresses, I'll submit a different experiment later today, and then revert this completely by the end of this day. TBR=mmentovai Review URL: http://codereview.chromium.org/215028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26656 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/cocoa/browser_window_controller.mm4
1 files changed, 0 insertions, 4 deletions
diff --git a/chrome/browser/cocoa/browser_window_controller.mm b/chrome/browser/cocoa/browser_window_controller.mm
index 2df1d97..c0e8ebc 100644
--- a/chrome/browser/cocoa/browser_window_controller.mm
+++ b/chrome/browser/cocoa/browser_window_controller.mm
@@ -190,9 +190,6 @@ willPositionSheet:(NSWindow*)sheet
}
[[[self window] contentView] addSubview:[toolbarController_ view]];
- // TODO(thakis): Turn this on once it doesn't regress startup performance
- // like crazy (but other than that, the shelf should work now).
-#if 0
if (browser_->SupportsWindowFeature(Browser::FEATURE_EXTENSIONSHELF)) {
// Create the extension shelf.
extensionShelfController_.reset([[ExtensionShelfController alloc]
@@ -201,7 +198,6 @@ willPositionSheet:(NSWindow*)sheet
[[[self window] contentView] addSubview:[extensionShelfController_ view]];
[extensionShelfController_ wasInsertedIntoWindow];
}
-#endif
[self fixWindowGradient];