diff options
author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-10 06:48:18 +0000 |
---|---|---|
committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-10 06:48:18 +0000 |
commit | 675112ffb6168a9e9579305d4618fc7f0a2e6e74 (patch) | |
tree | d7123c168aa76fd6c6d441471ef1aa1fac189bfe /chrome/browser/browser.cc | |
parent | 474f059570ce28bc9f93a140e4396d5e35d9c09c (diff) | |
download | chromium_src-675112ffb6168a9e9579305d4618fc7f0a2e6e74.zip chromium_src-675112ffb6168a9e9579305d4618fc7f0a2e6e74.tar.gz chromium_src-675112ffb6168a9e9579305d4618fc7f0a2e6e74.tar.bz2 |
Revert 35888 - Mac: Other approach for IPCing child task_ts.
Based on http://www.foldr.org/~michaelw/log/2009/03/13/ , right now in proofofconcept quality.
Works for worker processes too and seems more reliable in general. Makes it impossible to call LaunchApp() concurrently though.
Next try: Submitting to get perf numbers, will revert.
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=35883
Review URL: http://codereview.chromium.org/549002
TBR=thakis@chromium.org
Review URL: http://codereview.chromium.org/536009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35890 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.cc')
-rw-r--r-- | chrome/browser/browser.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index 6a0ba3e..91f0101 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -2557,9 +2557,9 @@ void Browser::InitCommandState() { command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS_CONSOLE, true); // TODO(viettrungluu): Temporarily disabled on Mac. Must disable here (not in // BWC) so that it also affects the page menu. http://crbug.com/13156 -//#if !defined(OS_MACOSX) +#if !defined(OS_MACOSX) command_updater_.UpdateCommandEnabled(IDC_TASK_MANAGER, true); -//#endif +#endif command_updater_.UpdateCommandEnabled(IDC_SELECT_PROFILE, true); command_updater_.UpdateCommandEnabled(IDC_SHOW_HISTORY, true); command_updater_.UpdateCommandEnabled(IDC_SHOW_BOOKMARK_MANAGER, true); |