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

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

Issue 138783002: Cleans up gyp file for views example and removes duplicate code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix windows Created 6 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 | « ui/views/examples/example_base.h ('k') | ui/views/examples/examples_window.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "base/at_exit.h" 5 #include "base/at_exit.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "base/i18n/icu_util.h" 8 #include "base/i18n/icu_util.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
11 #include "base/run_loop.h" 11 #include "base/run_loop.h"
12 #include "ui/aura/env.h" 12 #include "ui/aura/env.h"
13 #include "ui/base/ime/input_method_initializer.h" 13 #include "ui/base/ime/input_method_initializer.h"
14 #include "ui/base/resource/resource_bundle.h" 14 #include "ui/base/resource/resource_bundle.h"
15 #include "ui/compositor/test/context_factories_for_test.h" 15 #include "ui/compositor/test/context_factories_for_test.h"
16 #include "ui/gfx/screen.h" 16 #include "ui/gfx/screen.h"
17 #include "ui/views/corewm/wm_state.h" 17 #include "ui/views/corewm/wm_state.h"
18 #include "ui/views/examples/example_base.h"
18 #include "ui/views/examples/examples_window.h" 19 #include "ui/views/examples/examples_window.h"
19 #include "ui/views/test/desktop_test_views_delegate.h" 20 #include "ui/views/test/desktop_test_views_delegate.h"
20 21
21 #if !defined(OS_CHROMEOS) 22 #if !defined(OS_CHROMEOS)
22 #include "ui/views/widget/desktop_aura/desktop_screen.h" 23 #include "ui/views/widget/desktop_aura/desktop_screen.h"
23 #endif 24 #endif
24 #if defined(OS_WIN) 25 #if defined(OS_WIN)
25 #include "ui/base/win/scoped_ole_initializer.h" 26 #include "ui/base/win/scoped_ole_initializer.h"
26 #endif 27 #endif
27 28
(...skipping 28 matching lines...) Expand all
56 { 57 {
57 views::DesktopTestViewsDelegate views_delegate; 58 views::DesktopTestViewsDelegate views_delegate;
58 views::corewm::WMState wm_state; 59 views::corewm::WMState wm_state;
59 60
60 #if !defined(OS_CHROMEOS) 61 #if !defined(OS_CHROMEOS)
61 scoped_ptr<gfx::Screen> desktop_screen(views::CreateDesktopScreen()); 62 scoped_ptr<gfx::Screen> desktop_screen(views::CreateDesktopScreen());
62 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, 63 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE,
63 desktop_screen.get()); 64 desktop_screen.get());
64 #endif 65 #endif
65 66
66 views::examples::ShowExamplesWindow(views::examples::QUIT_ON_CLOSE); 67 views::examples::ShowExamplesWindow(
68 views::examples::QUIT_ON_CLOSE,
69 NULL,
70 scoped_ptr<ScopedVector<views::examples::ExampleBase> >());
67 71
68 base::RunLoop().Run(); 72 base::RunLoop().Run();
69 73
70 ui::ResourceBundle::CleanupSharedInstance(); 74 ui::ResourceBundle::CleanupSharedInstance();
71 } 75 }
72 76
73 ui::ShutdownInputMethod(); 77 ui::ShutdownInputMethod();
74 78
75 aura::Env::DeleteInstance(); 79 aura::Env::DeleteInstance();
76 80
77 return 0; 81 return 0;
78 } 82 }
OLDNEW
« no previous file with comments | « ui/views/examples/example_base.h ('k') | ui/views/examples/examples_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698