Index: chrome/browser/ui/cocoa/task_manager_mac.mm |
diff --git a/chrome/browser/ui/cocoa/task_manager_mac.mm b/chrome/browser/ui/cocoa/task_manager_mac.mm |
index c5b7f017696b6390be8ab9b921ea805d1e13b62f..24820510127ccc533418b87450763b34c522cb9b 100644 |
--- a/chrome/browser/ui/cocoa/task_manager_mac.mm |
+++ b/chrome/browser/ui/cocoa/task_manager_mac.mm |
@@ -7,13 +7,16 @@ |
#include <algorithm> |
#include <vector> |
+#include "base/command_line.h" |
#include "base/mac/bundle_locations.h" |
#include "base/mac/mac_util.h" |
#include "base/prefs/pref_service.h" |
#include "base/strings/sys_string_conversions.h" |
#include "chrome/browser/browser_process.h" |
+#include "chrome/browser/ui/browser_dialogs.h" |
#import "chrome/browser/ui/cocoa/window_size_autosaver.h" |
#include "chrome/browser/ui/host_desktop.h" |
+#include "chrome/common/chrome_switches.h" |
#include "chrome/common/pref_names.h" |
#include "chrome/grit/generated_resources.h" |
#include "third_party/skia/include/core/SkBitmap.h" |
@@ -549,6 +552,13 @@ namespace chrome { |
// Declared in browser_dialogs.h. |
void ShowTaskManager(Browser* browser) { |
+#if 0 && defined(TOOLKIT_VIEWS) |
+ if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseToolkitViews)) { |
+ TaskManagerView::Show(browser); |
+ return; |
+ } |
+#endif |
+ |
TaskManagerMac::Show(); |
} |
@@ -557,4 +567,3 @@ void HideTaskManager() { |
} |
} // namespace chrome |
- |