| OLD | NEW |
| 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 #include "chrome/browser/ui/cocoa/task_manager_mac.h" | 5 #include "chrome/browser/ui/cocoa/task_manager_mac.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/mac/bundle_locations.h" | 10 #include "base/mac/bundle_locations.h" |
| 11 #include "base/mac/mac_util.h" | 11 #include "base/mac/mac_util.h" |
| 12 #include "base/sys_string_conversions.h" | 12 #include "base/sys_string_conversions.h" |
| 13 #include "chrome/browser/browser_process.h" | 13 #include "chrome/browser/browser_process.h" |
| 14 #include "chrome/browser/prefs/pref_service.h" |
| 14 #import "chrome/browser/ui/cocoa/window_size_autosaver.h" | 15 #import "chrome/browser/ui/cocoa/window_size_autosaver.h" |
| 15 #include "chrome/browser/ui/host_desktop.h" | 16 #include "chrome/browser/ui/host_desktop.h" |
| 16 #include "chrome/common/pref_names.h" | 17 #include "chrome/common/pref_names.h" |
| 17 #include "grit/generated_resources.h" | 18 #include "grit/generated_resources.h" |
| 18 #include "third_party/skia/include/core/SkBitmap.h" | 19 #include "third_party/skia/include/core/SkBitmap.h" |
| 19 #include "ui/base/l10n/l10n_util_mac.h" | 20 #include "ui/base/l10n/l10n_util_mac.h" |
| 20 #include "ui/gfx/image/image_skia.h" | 21 #include "ui/gfx/image/image_skia.h" |
| 21 | 22 |
| 22 namespace { | 23 namespace { |
| 23 | 24 |
| (...skipping 630 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 654 // "Task Manager" so close the existing window and fall through to | 655 // "Task Manager" so close the existing window and fall through to |
| 655 // open a new one. | 656 // open a new one. |
| 656 [[instance_->window_controller_ window] close]; | 657 [[instance_->window_controller_ window] close]; |
| 657 } | 658 } |
| 658 } | 659 } |
| 659 // Create a new instance. | 660 // Create a new instance. |
| 660 instance_ = new TaskManagerMac(TaskManager::GetInstance(), | 661 instance_ = new TaskManagerMac(TaskManager::GetInstance(), |
| 661 highlight_background_resources); | 662 highlight_background_resources); |
| 662 instance_->model_->StartUpdating(); | 663 instance_->model_->StartUpdating(); |
| 663 } | 664 } |
| OLD | NEW |