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

Side by Side Diff: ui/aura_shell/examples/aura_shell_main.cc

Issue 8574033: Beginnings of Window Modality support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 1 month 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/aura_shell/desktop_event_filter.cc ('k') | ui/aura_shell/examples/window_type_launcher.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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "ui/aura/desktop.h" 10 #include "ui/aura/desktop.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 item->tab_images[i].image.eraseARGB(255, 53 item->tab_images[i].image.eraseARGB(255,
54 i == 0 ? 255 : 0, 54 i == 0 ? 255 : 0,
55 i == 1 ? 255 : 0, 55 i == 1 ? 255 : 0,
56 i == 2 ? 255 : 0); 56 i == 2 ? 255 : 0);
57 } 57 }
58 image_count = (image_count + 1) % 3; 58 image_count = (image_count + 1) % 3;
59 return true; // Makes the entry show up in the launcher. 59 return true; // Makes the entry show up in the launcher.
60 } 60 }
61 }; 61 };
62 62
63 } // namesapce 63 } // namespace
64
65 namespace aura_shell {
66 namespace examples {
67
68 void InitWindowTypeLauncher();
69
70 } // namespace examples
71 } // namespace aura_shell
64 72
65 int main(int argc, char** argv) { 73 int main(int argc, char** argv) {
66 CommandLine::Init(argc, argv); 74 CommandLine::Init(argc, argv);
67 75
68 // The exit manager is in charge of calling the dtors of singleton objects. 76 // The exit manager is in charge of calling the dtors of singleton objects.
69 base::AtExitManager exit_manager; 77 base::AtExitManager exit_manager;
70 78
71 ui::RegisterPathProvider(); 79 ui::RegisterPathProvider();
72 icu_util::Initialize(); 80 icu_util::Initialize();
73 ResourceBundle::InitSharedInstance("en-US"); 81 ResourceBundle::InitSharedInstance("en-US");
74 82
75 // Create the message-loop here before creating the desktop. 83 // Create the message-loop here before creating the desktop.
76 MessageLoop message_loop(MessageLoop::TYPE_UI); 84 MessageLoop message_loop(MessageLoop::TYPE_UI);
77 ui::CompositorTestSupport::Initialize(); 85 ui::CompositorTestSupport::Initialize();
78 86
79 aura_shell::Shell::CreateInstance(new ShellDelegateImpl); 87 aura_shell::Shell::CreateInstance(new ShellDelegateImpl);
80 88
81 aura_shell::examples::InitWindowTypeLauncher(); 89 aura_shell::examples::InitWindowTypeLauncher();
82 90
83 aura::Desktop::GetInstance()->Run(); 91 aura::Desktop::GetInstance()->Run();
84 92
85 delete aura::Desktop::GetInstance(); 93 delete aura::Desktop::GetInstance();
86 94
87 ui::CompositorTestSupport::Terminate(); 95 ui::CompositorTestSupport::Terminate();
88 96
89 return 0; 97 return 0;
90 } 98 }
OLDNEW
« no previous file with comments | « ui/aura_shell/desktop_event_filter.cc ('k') | ui/aura_shell/examples/window_type_launcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698