Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(146)

Side by Side Diff: chrome/browser/ui/views/task_manager_view.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/task_manager/task_manager.h" 5 #include "chrome/browser/task_manager/task_manager.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/prefs/pref_service.h"
12 #include "base/prefs/scoped_user_pref_update.h"
13 #include "base/strings/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
14 #include "build/build_config.h" 12 #include "build/build_config.h"
15 #include "chrome/app/chrome_command_ids.h" 13 #include "chrome/app/chrome_command_ids.h"
16 #include "chrome/browser/browser_process.h" 14 #include "chrome/browser/browser_process.h"
17 #include "chrome/browser/ui/browser.h" 15 #include "chrome/browser/ui/browser.h"
18 #include "chrome/browser/ui/browser_list.h" 16 #include "chrome/browser/ui/browser_list.h"
19 #include "chrome/browser/ui/browser_window.h" 17 #include "chrome/browser/ui/browser_window.h"
20 #include "chrome/browser/ui/host_desktop.h" 18 #include "chrome/browser/ui/host_desktop.h"
21 #include "chrome/browser/ui/views/browser_dialogs.h" 19 #include "chrome/browser/ui/views/browser_dialogs.h"
22 #include "chrome/browser/ui/views/new_task_manager_view.h" 20 #include "chrome/browser/ui/views/new_task_manager_view.h"
23 #include "chrome/common/chrome_switches.h" 21 #include "chrome/common/chrome_switches.h"
24 #include "chrome/common/pref_names.h" 22 #include "chrome/common/pref_names.h"
25 #include "chrome/grit/chromium_strings.h" 23 #include "chrome/grit/chromium_strings.h"
26 #include "chrome/grit/generated_resources.h" 24 #include "chrome/grit/generated_resources.h"
25 #include "components/prefs/pref_service.h"
26 #include "components/prefs/scoped_user_pref_update.h"
27 #include "ui/base/accelerators/accelerator.h" 27 #include "ui/base/accelerators/accelerator.h"
28 #include "ui/base/l10n/l10n_util.h" 28 #include "ui/base/l10n/l10n_util.h"
29 #include "ui/base/models/simple_menu_model.h" 29 #include "ui/base/models/simple_menu_model.h"
30 #include "ui/base/models/table_model.h" 30 #include "ui/base/models/table_model.h"
31 #include "ui/base/models/table_model_observer.h" 31 #include "ui/base/models/table_model_observer.h"
32 #include "ui/events/event_constants.h" 32 #include "ui/events/event_constants.h"
33 #include "ui/events/keycodes/keyboard_codes.h" 33 #include "ui/events/keycodes/keyboard_codes.h"
34 #include "ui/gfx/canvas.h" 34 #include "ui/gfx/canvas.h"
35 #include "ui/views/context_menu_controller.h" 35 #include "ui/views/context_menu_controller.h"
36 #include "ui/views/controls/button/label_button.h" 36 #include "ui/views/controls/button/label_button.h"
(...skipping 625 matching lines...) Expand 10 before | Expand all | Expand 10 after
662 void HideTaskManager() { 662 void HideTaskManager() {
663 if (switches::NewTaskManagerEnabled()) { 663 if (switches::NewTaskManagerEnabled()) {
664 task_management::NewTaskManagerView::Hide(); 664 task_management::NewTaskManagerView::Hide();
665 return; 665 return;
666 } 666 }
667 667
668 TaskManagerView::Hide(); 668 TaskManagerView::Hide();
669 } 669 }
670 670
671 } // namespace chrome 671 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc ('k') | chrome/browser/ui/views/toolbar/home_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698