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

Side by Side Diff: ui/aura/demo/demo_main.cc

Issue 10270023: Add new ResourceBundle::Delegate interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 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_frame/test/net/fake_external_tab.cc ('k') | ui/aura/test/test_suite.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 (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 "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/i18n/icu_util.h" 7 #include "base/i18n/icu_util.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "third_party/skia/include/core/SkXfermode.h" 10 #include "third_party/skia/include/core/SkXfermode.h"
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 } // namespace 99 } // namespace
100 100
101 int main(int argc, char** argv) { 101 int main(int argc, char** argv) {
102 CommandLine::Init(argc, argv); 102 CommandLine::Init(argc, argv);
103 103
104 // The exit manager is in charge of calling the dtors of singleton objects. 104 // The exit manager is in charge of calling the dtors of singleton objects.
105 base::AtExitManager exit_manager; 105 base::AtExitManager exit_manager;
106 106
107 ui::RegisterPathProvider(); 107 ui::RegisterPathProvider();
108 icu_util::Initialize(); 108 icu_util::Initialize();
109 ResourceBundle::InitSharedInstanceWithLocale("en-US"); 109 ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
110 110
111 // Create the message-loop here before creating the root window. 111 // Create the message-loop here before creating the root window.
112 MessageLoop message_loop(MessageLoop::TYPE_UI); 112 MessageLoop message_loop(MessageLoop::TYPE_UI);
113 ui::CompositorTestSupport::Initialize(); 113 ui::CompositorTestSupport::Initialize();
114 aura::Env::GetInstance()->SetMonitorManager(new aura::SingleMonitorManager); 114 aura::Env::GetInstance()->SetMonitorManager(new aura::SingleMonitorManager);
115 scoped_ptr<aura::RootWindow> root_window( 115 scoped_ptr<aura::RootWindow> root_window(
116 aura::MonitorManager::CreateRootWindowForPrimaryMonitor()); 116 aura::MonitorManager::CreateRootWindowForPrimaryMonitor());
117 scoped_ptr<DemoStackingClient> stacking_client(new DemoStackingClient( 117 scoped_ptr<DemoStackingClient> stacking_client(new DemoStackingClient(
118 root_window.get())); 118 root_window.get()));
119 119
(...skipping 22 matching lines...) Expand all
142 window3.Show(); 142 window3.Show();
143 window3.SetParent(&window2); 143 window3.SetParent(&window2);
144 144
145 root_window->ShowRootWindow(); 145 root_window->ShowRootWindow();
146 MessageLoopForUI::current()->Run(); 146 MessageLoopForUI::current()->Run();
147 147
148 ui::CompositorTestSupport::Terminate(); 148 ui::CompositorTestSupport::Terminate();
149 149
150 return 0; 150 return 0;
151 } 151 }
OLDNEW
« no previous file with comments | « chrome_frame/test/net/fake_external_tab.cc ('k') | ui/aura/test/test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698