chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc - Issue 11962021: Revert 177182 - ViewTest.ChangeNativeViewHierarchyFindRoots failure

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/views/ash/chrome_browser_main_extra_parts_ash.cc

Issue 11962021: Revert 177182 - ViewTest.ChangeNativeViewHierarchyFindRoots failure (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 7 years, 11 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/ui/aura/stacking_client_aura.cc ('k') | chrome/browser/ui/views/chrome_views_delegate.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/views/ash/chrome_browser_main_extra_parts_ash.h"	5 #include "chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h"

6	6

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

8 #include "chrome/browser/chrome_browser_main.h"	8 #include "chrome/browser/chrome_browser_main.h"

9 #include "chrome/browser/toolkit_extra_parts.h"	9 #include "chrome/browser/toolkit_extra_parts.h"

10 #include "chrome/browser/ui/ash/ash_init.h"	10 #include "chrome/browser/ui/ash/ash_init.h"

11 #include "chrome/browser/ui/ash/ash_util.h"	11 #include "chrome/browser/ui/ash/ash_util.h"

12 #include "chrome/browser/ui/views/ash/tab_scrubber.h"	12 #include "chrome/browser/ui/views/ash/tab_scrubber.h"

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

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

15 #include "ui/gfx/screen.h"	15 #include "ui/gfx/screen.h"

16 #include "ui/gfx/screen_type_delegate.h"	16 #include "ui/gfx/screen_type_delegate.h"

17 #include "ui/views/widget/desktop_aura/desktop_screen.h"	17 #include "ui/views/widget/desktop_aura/desktop_screen.h"

	18 #include "ui/views/widget/desktop_aura/desktop_stacking_client.h"

18	19

19 #if defined(FILE_MANAGER_EXTENSION)	20 #if defined(FILE_MANAGER_EXTENSION)

20 #include "chrome/browser/ui/views/select_file_dialog_extension.h"	21 #include "chrome/browser/ui/views/select_file_dialog_extension.h"

21 #include "chrome/browser/ui/views/select_file_dialog_extension_factory.h"	22 #include "chrome/browser/ui/views/select_file_dialog_extension_factory.h"

22 #endif	23 #endif

23	24

24 #if !defined(OS_CHROMEOS)	25 #if !defined(OS_CHROMEOS)

25 class ScreenTypeDelegateWin : public gfx::ScreenTypeDelegate {	26 class ScreenTypeDelegateWin : public gfx::ScreenTypeDelegate {

26 public:	27 public:

27 ScreenTypeDelegateWin() {}	28 ScreenTypeDelegateWin() {}

(...skipping 39 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
67 chrome::CloseAsh();	68 chrome::CloseAsh();

68 }	69 }

69	70

70 namespace chrome {	71 namespace chrome {

71	72

72 void AddAshToolkitExtraParts(ChromeBrowserMainParts* main_parts) {	73 void AddAshToolkitExtraParts(ChromeBrowserMainParts* main_parts) {

73 main_parts->AddParts(new ChromeBrowserMainExtraPartsAsh());	74 main_parts->AddParts(new ChromeBrowserMainExtraPartsAsh());

74 }	75 }

75	76

76 } // namespace chrome	77 } // namespace chrome

OLD	NEW