chrome/browser/ui/ash/ash_init.cc - Issue 10824352: chrome: Switch to use chrome_shell_delegate from ash/.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10824352: chrome: Switch to use chrome_shell_delegate from ash/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 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 | « no previous file | chrome/browser/ui/views/frame/browser_view.cc » ('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/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/shell.h"	11 #include "ash/shell.h"

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

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

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

15 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"	15 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"

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

17 #include "chrome/browser/ui/ash/caps_lock_handler.h"	17 #include "chrome/browser/ui/ash/caps_lock_handler.h"

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

18 #include "chrome/browser/ui/ash/event_rewriter.h"	19 #include "chrome/browser/ui/ash/event_rewriter.h"

19 #include "chrome/browser/ui/ash/screenshot_taker.h"	20 #include "chrome/browser/ui/ash/screenshot_taker.h"

20 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h"

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

22 #include "ui/aura/aura_switches.h"	22 #include "ui/aura/aura_switches.h"

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

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

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

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

27	27

28 #if defined(OS_CHROMEOS)	28 #if defined(OS_CHROMEOS)

29 #include "base/chromeos/chromeos_version.h"	29 #include "base/chromeos/chromeos_version.h"

30 #include "chrome/browser/chromeos/input_method/input_method_manager.h"	30 #include "chrome/browser/chromeos/input_method/input_method_manager.h"

(...skipping 69 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
100 #endif	100 #endif

101 ash::Shell::GetPrimaryRootWindow()->ShowRootWindow();	101 ash::Shell::GetPrimaryRootWindow()->ShowRootWindow();

102 }	102 }

103	103

104 void CloseAsh() {	104 void CloseAsh() {

105 if (ash::Shell::GetInstance())	105 if (ash::Shell::GetInstance())

106 ash::Shell::DeleteInstance();	106 ash::Shell::DeleteInstance();

107 }	107 }

108	108

109 } // namespace chrome	109 } // namespace chrome

OLD	NEW