ui/views/examples/content_client/examples_browser_main_parts.h - Issue 191723003: Nukes USE_AURA ifdefs from views

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: ui/views/examples/content_client/examples_browser_main_parts.h

Issue 191723003: Nukes USE_AURA ifdefs from views (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: cleanup Created 6 years, 9 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

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 #ifndef UI_VIEWS_EXAMPLES_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_	5 #ifndef UI_VIEWS_EXAMPLES_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_

6 #define UI_VIEWS_EXAMPLES_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_	6 #define UI_VIEWS_EXAMPLES_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_

7	7

8 #include "base/macros.h"	8 #include "base/macros.h"

9 #include "base/memory/scoped_ptr.h"	9 #include "base/memory/scoped_ptr.h"

10 #include "content/public/browser/browser_main_parts.h"	10 #include "content/public/browser/browser_main_parts.h"

(...skipping 35 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
46 private:	46 private:

47 scoped_ptr<content::ShellBrowserContext> browser_context_;	47 scoped_ptr<content::ShellBrowserContext> browser_context_;

48	48

49 scoped_ptr<ViewsDelegate> views_delegate_;	49 scoped_ptr<ViewsDelegate> views_delegate_;

50	50

51 #if defined(OS_CHROMEOS)	51 #if defined(OS_CHROMEOS)

52 // Enable a minimal set of views::corewm to be initialized.	52 // Enable a minimal set of views::corewm to be initialized.

53 scoped_ptr<wm::WMTestHelper> wm_test_helper_;	53 scoped_ptr<wm::WMTestHelper> wm_test_helper_;

54 #endif	54 #endif

55	55

56 #if defined(USE_AURA)

57 scoped_ptr<views::corewm::WMState> wm_state_;	56 scoped_ptr<views::corewm::WMState> wm_state_;

58 #endif

59	57

60 DISALLOW_COPY_AND_ASSIGN(ExamplesBrowserMainParts);	58 DISALLOW_COPY_AND_ASSIGN(ExamplesBrowserMainParts);

61 };	59 };

62	60

63 } // namespace examples	61 } // namespace examples

64 } // namespace views	62 } // namespace views

65	63

66 #endif // UI_VIEWS_EXAMPLES_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_	64 #endif // UI_VIEWS_EXAMPLES_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_

OLD	NEW

« ui/views/drag_utils.cc ('K') | « ui/views/event_utils_win.cc ('k') | ui/views/examples/content_client/examples_browser_main_parts.cc » ('j') | ui/views/focus/focus_manager_unittest.cc » ('J')