Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(452)

Side by Side Diff: ui/views/examples/examples_main.cc

Issue 2326933002: MacViews: Fix gn check fail for mac_views_browser on Aura dependencies. (Closed)
Patch Set: Typo. Created 4 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
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 <memory> 5 #include <memory>
6 6
7 #include "base/at_exit.h" 7 #include "base/at_exit.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/i18n/icu_util.h" 10 #include "base/i18n/icu_util.h"
(...skipping 11 matching lines...) Expand all
22 #include "ui/base/resource/resource_bundle.h" 22 #include "ui/base/resource/resource_bundle.h"
23 #include "ui/base/ui_base_paths.h" 23 #include "ui/base/ui_base_paths.h"
24 #include "ui/compositor/test/in_process_context_factory.h" 24 #include "ui/compositor/test/in_process_context_factory.h"
25 #include "ui/display/screen.h" 25 #include "ui/display/screen.h"
26 #include "ui/gl/init/gl_factory.h" 26 #include "ui/gl/init/gl_factory.h"
27 #include "ui/views/examples/example_base.h" 27 #include "ui/views/examples/example_base.h"
28 #include "ui/views/examples/examples_window.h" 28 #include "ui/views/examples/examples_window.h"
29 #include "ui/views/test/desktop_test_views_delegate.h" 29 #include "ui/views/test/desktop_test_views_delegate.h"
30 30
31 #if defined(USE_AURA) 31 #if defined(USE_AURA)
32 #include "ui/aura/env.h" 32 #include "ui/aura/env.h" // nogncheck
33 #include "ui/wm/core/wm_state.h" 33 #include "ui/wm/core/wm_state.h" // nogncheck
34 #endif 34 #endif
35 35
36 #if !defined(OS_CHROMEOS) && defined(USE_AURA) 36 #if !defined(OS_CHROMEOS) && defined(USE_AURA)
37 #include "ui/views/widget/desktop_aura/desktop_screen.h" 37 #include "ui/views/widget/desktop_aura/desktop_screen.h"
38 #endif 38 #endif
39 39
40 #if defined(OS_WIN) 40 #if defined(OS_WIN)
41 #include "ui/base/win/scoped_ole_initializer.h" 41 #include "ui/base/win/scoped_ole_initializer.h"
42 #include "ui/gfx/win/direct_write.h" 42 #include "ui/gfx/win/direct_write.h"
43 #endif 43 #endif
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 } 121 }
122 122
123 ui::ShutdownInputMethod(); 123 ui::ShutdownInputMethod();
124 124
125 #if defined(USE_AURA) 125 #if defined(USE_AURA)
126 env.reset(); 126 env.reset();
127 #endif 127 #endif
128 128
129 return 0; 129 return 0;
130 } 130 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698