OLD | NEW |
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 13 matching lines...) Expand all Loading... |
24 ShellDelegateImpl() { | 24 ShellDelegateImpl() { |
25 } | 25 } |
26 | 26 |
27 virtual void CreateNewWindow() OVERRIDE { | 27 virtual void CreateNewWindow() OVERRIDE { |
28 aura_shell::examples::ToplevelWindow::CreateParams create_params; | 28 aura_shell::examples::ToplevelWindow::CreateParams create_params; |
29 create_params.can_resize = true; | 29 create_params.can_resize = true; |
30 create_params.can_maximize = true; | 30 create_params.can_maximize = true; |
31 aura_shell::examples::ToplevelWindow::CreateToplevelWindow(create_params); | 31 aura_shell::examples::ToplevelWindow::CreateToplevelWindow(create_params); |
32 } | 32 } |
33 | 33 |
| 34 virtual views::Widget* CreateStatusArea() OVERRIDE { |
| 35 return aura_shell::internal::CreateStatusArea(); |
| 36 } |
| 37 |
34 virtual void ShowApps() OVERRIDE { | 38 virtual void ShowApps() OVERRIDE { |
35 NOTIMPLEMENTED(); | 39 NOTIMPLEMENTED(); |
36 } | 40 } |
37 | 41 |
38 virtual void LauncherItemClicked( | 42 virtual void LauncherItemClicked( |
39 const aura_shell::LauncherItem& item) OVERRIDE { | 43 const aura_shell::LauncherItem& item) OVERRIDE { |
40 item.window->Activate(); | 44 item.window->Activate(); |
41 } | 45 } |
42 | 46 |
43 virtual bool ConfigureLauncherItem(aura_shell::LauncherItem* item) OVERRIDE { | 47 virtual bool ConfigureLauncherItem(aura_shell::LauncherItem* item) OVERRIDE { |
(...skipping 21 matching lines...) Expand all Loading... |
65 base::AtExitManager exit_manager; | 69 base::AtExitManager exit_manager; |
66 | 70 |
67 ui::RegisterPathProvider(); | 71 ui::RegisterPathProvider(); |
68 icu_util::Initialize(); | 72 icu_util::Initialize(); |
69 ResourceBundle::InitSharedInstance("en-US"); | 73 ResourceBundle::InitSharedInstance("en-US"); |
70 | 74 |
71 // Create the message-loop here before creating the desktop. | 75 // Create the message-loop here before creating the desktop. |
72 MessageLoop message_loop(MessageLoop::TYPE_UI); | 76 MessageLoop message_loop(MessageLoop::TYPE_UI); |
73 ui::CompositorTestSupport::Initialize(); | 77 ui::CompositorTestSupport::Initialize(); |
74 | 78 |
75 aura_shell::Shell::GetInstance()->SetDelegate(new ShellDelegateImpl);; | 79 aura_shell::Shell::CreateInstance(new ShellDelegateImpl); |
76 | 80 |
77 aura_shell::examples::InitWindowTypeLauncher(); | 81 aura_shell::examples::InitWindowTypeLauncher(); |
78 | 82 |
79 aura::Desktop::GetInstance()->Run(); | 83 aura::Desktop::GetInstance()->Run(); |
80 | 84 |
81 delete aura::Desktop::GetInstance(); | 85 delete aura::Desktop::GetInstance(); |
82 | 86 |
83 ui::CompositorTestSupport::Terminate(); | 87 ui::CompositorTestSupport::Terminate(); |
84 | 88 |
85 return 0; | 89 return 0; |
86 } | 90 } |
87 | |
OLD | NEW |