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

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

Issue 1608733002: Remove ui/gfx/screen_type_delegate.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-4
Patch Set: and another rebase Created 4 years, 10 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
« no previous file with comments | « ui/views/drag_utils.cc ('k') | ui/views/mouse_watcher_view_host.cc » ('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"
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 #endif 86 #endif
87 ui::InitializeInputMethodForTesting(); 87 ui::InitializeInputMethodForTesting();
88 88
89 { 89 {
90 views::DesktopTestViewsDelegate views_delegate; 90 views::DesktopTestViewsDelegate views_delegate;
91 #if defined(USE_AURA) 91 #if defined(USE_AURA)
92 wm::WMState wm_state; 92 wm::WMState wm_state;
93 #endif 93 #endif
94 #if !defined(OS_CHROMEOS) && defined(USE_AURA) 94 #if !defined(OS_CHROMEOS) && defined(USE_AURA)
95 scoped_ptr<gfx::Screen> desktop_screen(views::CreateDesktopScreen()); 95 scoped_ptr<gfx::Screen> desktop_screen(views::CreateDesktopScreen());
96 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, 96 gfx::Screen::SetScreenInstance(desktop_screen.get());
97 desktop_screen.get());
98 #endif 97 #endif
99 98
100 views::examples::ShowExamplesWindow( 99 views::examples::ShowExamplesWindow(
101 views::examples::QUIT_ON_CLOSE, nullptr, 100 views::examples::QUIT_ON_CLOSE, nullptr,
102 scoped_ptr<ScopedVector<views::examples::ExampleBase>>()); 101 scoped_ptr<ScopedVector<views::examples::ExampleBase>>());
103 102
104 base::RunLoop().Run(); 103 base::RunLoop().Run();
105 104
106 ui::ResourceBundle::CleanupSharedInstance(); 105 ui::ResourceBundle::CleanupSharedInstance();
107 } 106 }
108 107
109 ui::ShutdownInputMethod(); 108 ui::ShutdownInputMethod();
110 109
111 #if defined(USE_AURA) 110 #if defined(USE_AURA)
112 aura::Env::DeleteInstance(); 111 aura::Env::DeleteInstance();
113 #endif 112 #endif
114 113
115 return 0; 114 return 0;
116 } 115 }
OLDNEW
« no previous file with comments | « ui/views/drag_utils.cc ('k') | ui/views/mouse_watcher_view_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698