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/common/pref_names.h" | 16 #include "chrome/common/pref_names.h" |
16 #include "grit/generated_resources.h" | 17 #include "grit/generated_resources.h" |
17 #include "third_party/skia/include/core/SkBitmap.h" | 18 #include "third_party/skia/include/core/SkBitmap.h" |
18 #include "ui/base/l10n/l10n_util_mac.h" | 19 #include "ui/base/l10n/l10n_util_mac.h" |
19 #include "ui/gfx/image/image_skia.h" | 20 #include "ui/gfx/image/image_skia.h" |
20 | 21 |
21 namespace { | 22 namespace { |
22 | 23 |
23 // Width of "a" and most other letters/digits in "small" table views. | 24 // Width of "a" and most other letters/digits in "small" table views. |
(...skipping 629 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
653 // "Task Manager" so close the existing window and fall through to | 654 // "Task Manager" so close the existing window and fall through to |
654 // open a new one. | 655 // open a new one. |
655 [[instance_->window_controller_ window] close]; | 656 [[instance_->window_controller_ window] close]; |
656 } | 657 } |
657 } | 658 } |
658 // Create a new instance. | 659 // Create a new instance. |
659 instance_ = new TaskManagerMac(TaskManager::GetInstance(), | 660 instance_ = new TaskManagerMac(TaskManager::GetInstance(), |
660 highlight_background_resources); | 661 highlight_background_resources); |
661 instance_->model_->StartUpdating(); | 662 instance_->model_->StartUpdating(); |
662 } | 663 } |
OLD | NEW |