chrome/browser/ui/ash/ash_init.cc - Issue 22293003: Clean up compositor initialization/destruction.

Side by Side Diff: chrome/browser/ui/ash/ash_init.cc

Issue 22293003: Clean up compositor initialization/destruction. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: cleanupcompositor: UseRealGLBindings in NetInternalsTest Created 7 years, 4 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/prerender/prerender_browsertest.cc ('k') | chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h » ('j') | content/public/test/browser_test_base.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

6	6

7 #include "ash/accelerators/accelerator_controller.h"	7 #include "ash/accelerators/accelerator_controller.h"

8 #include "ash/ash_switches.h"	8 #include "ash/ash_switches.h"

9 #include "ash/high_contrast/high_contrast_controller.h"	9 #include "ash/high_contrast/high_contrast_controller.h"

10 #include "ash/magnifier/magnification_controller.h"	10 #include "ash/magnifier/magnification_controller.h"

11 #include "ash/magnifier/partial_magnification_controller.h"	11 #include "ash/magnifier/partial_magnification_controller.h"

12 #include "ash/shell.h"	12 #include "ash/shell.h"

13 #include "ash/wm/event_rewriter_event_filter.h"	13 #include "ash/wm/event_rewriter_event_filter.h"

14 #include "base/command_line.h"	14 #include "base/command_line.h"

15 #include "chrome/browser/browser_shutdown.h"	15 #include "chrome/browser/browser_shutdown.h"

16 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"	16 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"

17 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"	17 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"

18 #include "chrome/browser/lifetime/application_lifetime.h"	18 #include "chrome/browser/lifetime/application_lifetime.h"

19 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"	19 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"

20 #include "chrome/browser/ui/ash/event_rewriter.h"	20 #include "chrome/browser/ui/ash/event_rewriter.h"

21 #include "chrome/browser/ui/ash/screenshot_taker.h"	21 #include "chrome/browser/ui/ash/screenshot_taker.h"

22 #include "chrome/common/chrome_switches.h"	22 #include "chrome/common/chrome_switches.h"

23 #include "ui/aura/env.h"	23 #include "ui/aura/env.h"

24 #include "ui/aura/root_window.h"	24 #include "ui/aura/root_window.h"

25 #include "ui/compositor/compositor_setup.h"

26	25

27 #if defined(OS_CHROMEOS)	26 #if defined(OS_CHROMEOS)

28 #include "base/chromeos/chromeos_version.h"	27 #include "base/chromeos/chromeos_version.h"

29 #include "chrome/browser/ui/ash/brightness_controller_chromeos.h"	28 #include "chrome/browser/ui/ash/brightness_controller_chromeos.h"

30 #include "chrome/browser/ui/ash/ime_controller_chromeos.h"	29 #include "chrome/browser/ui/ash/ime_controller_chromeos.h"

31 #include "chrome/browser/ui/ash/volume_controller_chromeos.h"	30 #include "chrome/browser/ui/ash/volume_controller_chromeos.h"

32 #include "chromeos/chromeos_switches.h"	31 #include "chromeos/chromeos_switches.h"

33 #include "chromeos/login/login_state.h"	32 #include "chromeos/login/login_state.h"

34 #include "ui/base/x/x11_util.h"	33 #include "ui/base/x/x11_util.h"

35 #endif	34 #endif

(...skipping 58 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
94 void CloseAsh() {	93 void CloseAsh() {

95 // If shutdown is initiated by \|BrowserX11IOErrorHandler\|, don't	94 // If shutdown is initiated by \|BrowserX11IOErrorHandler\|, don't

96 // try to cleanup resources.	95 // try to cleanup resources.

97 if (!browser_shutdown::ShuttingDownWithoutClosingBrowsers() &&	96 if (!browser_shutdown::ShuttingDownWithoutClosingBrowsers() &&

98 ash::Shell::HasInstance()) {	97 ash::Shell::HasInstance()) {

99 ash::Shell::DeleteInstance();	98 ash::Shell::DeleteInstance();

100 }	99 }

101 }	100 }

102	101

103 } // namespace chrome	102 } // namespace chrome

OLD	NEW