chrome/browser/ui/views/task_manager_view.cc - Issue 1336993002: Straighten up includes of host_desktop.h/host_desktop_type.h

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

Issue 1336993002: Straighten up includes of host_desktop.h/host_desktop_type.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@host_desktop_type

Patch Set: Build fixes for Windows and Mac Created 5 years, 3 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

« no previous file with comments | « chrome/browser/ui/views/tabs/window_finder_chromeos.cc ('k') | chrome/browser/ui/views/theme_image_mapper.h » ('j') | no next file with comments »

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/task_manager/task_manager.h"	5 #include "chrome/browser/task_manager/task_manager.h"

6	6

7 #include "base/compiler_specific.h"	7 #include "base/compiler_specific.h"

8 #include "base/prefs/pref_service.h"	8 #include "base/prefs/pref_service.h"

9 #include "base/prefs/scoped_user_pref_update.h"	9 #include "base/prefs/scoped_user_pref_update.h"

10 #include "base/strings/utf_string_conversions.h"	10 #include "base/strings/utf_string_conversions.h"

11 #include "chrome/app/chrome_command_ids.h"	11 #include "chrome/app/chrome_command_ids.h"

12 #include "chrome/browser/browser_process.h"	12 #include "chrome/browser/browser_process.h"

13 #include "chrome/browser/ui/browser.h"	13 #include "chrome/browser/ui/browser.h"

14 #include "chrome/browser/ui/browser_list.h"	14 #include "chrome/browser/ui/browser_list.h"

15 #include "chrome/browser/ui/browser_window.h"	15 #include "chrome/browser/ui/browser_window.h"

16 #include "chrome/browser/ui/host_desktop.h"

17 #include "chrome/browser/ui/views/browser_dialogs.h"	16 #include "chrome/browser/ui/views/browser_dialogs.h"

18 #include "chrome/browser/ui/views/new_task_manager_view.h"	17 #include "chrome/browser/ui/views/new_task_manager_view.h"

19 #include "chrome/common/chrome_switches.h"	18 #include "chrome/common/chrome_switches.h"

20 #include "chrome/common/pref_names.h"	19 #include "chrome/common/pref_names.h"

21 #include "chrome/grit/chromium_strings.h"	20 #include "chrome/grit/chromium_strings.h"

22 #include "chrome/grit/generated_resources.h"	21 #include "chrome/grit/generated_resources.h"

23 #include "ui/base/accelerators/accelerator.h"	22 #include "ui/base/accelerators/accelerator.h"

24 #include "ui/base/l10n/l10n_util.h"	23 #include "ui/base/l10n/l10n_util.h"

25 #include "ui/base/models/simple_menu_model.h"	24 #include "ui/base/models/simple_menu_model.h"

26 #include "ui/base/models/table_model.h"	25 #include "ui/base/models/table_model.h"

27 #include "ui/base/models/table_model_observer.h"	26 #include "ui/base/models/table_model_observer.h"

28 #include "ui/events/event_constants.h"	27 #include "ui/events/event_constants.h"

29 #include "ui/events/keycodes/keyboard_codes.h"	28 #include "ui/events/keycodes/keyboard_codes.h"

30 #include "ui/gfx/canvas.h"	29 #include "ui/gfx/canvas.h"

	30 #include "ui/gfx/host_desktop_type.h"

31 #include "ui/views/context_menu_controller.h"	31 #include "ui/views/context_menu_controller.h"

32 #include "ui/views/controls/button/label_button.h"	32 #include "ui/views/controls/button/label_button.h"

33 #include "ui/views/controls/link.h"	33 #include "ui/views/controls/link.h"

34 #include "ui/views/controls/link_listener.h"	34 #include "ui/views/controls/link_listener.h"

35 #include "ui/views/controls/menu/menu_runner.h"	35 #include "ui/views/controls/menu/menu_runner.h"

36 #include "ui/views/controls/table/table_grouper.h"	36 #include "ui/views/controls/table/table_grouper.h"

37 #include "ui/views/controls/table/table_view.h"	37 #include "ui/views/controls/table/table_view.h"

38 #include "ui/views/controls/table/table_view_observer.h"	38 #include "ui/views/controls/table/table_view_observer.h"

39 #include "ui/views/layout/layout_constants.h"	39 #include "ui/views/layout/layout_constants.h"

40 #include "ui/views/widget/widget.h"	40 #include "ui/views/widget/widget.h"

(...skipping 616 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
657 void HideTaskManager() {	657 void HideTaskManager() {

658 if (switches::NewTaskManagerEnabled()) {	658 if (switches::NewTaskManagerEnabled()) {

659 task_management::NewTaskManagerView::Hide();	659 task_management::NewTaskManagerView::Hide();

660 return;	660 return;

661 }	661 }

662	662

663 TaskManagerView::Hide();	663 TaskManagerView::Hide();

664 }	664 }

665	665

666 } // namespace chrome	666 } // namespace chrome

OLD	NEW