diff options
| author | stevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-14 00:06:08 +0000 |
|---|---|---|
| committer | stevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-14 00:06:08 +0000 |
| commit | 3266c2b9cc63c1a4533f8e99cb535f30e67e5499 (patch) | |
| tree | 58e0ab9c7259a575f2d4abd8da7bda731b0f14b3 /ui/aura_shell/examples/aura_shell_main.cc | |
| parent | f6231b17e8a950570602ed4b6e99d08f8f9f85f6 (diff) | |
| download | chromium_src-3266c2b9cc63c1a4533f8e99cb535f30e67e5499.zip chromium_src-3266c2b9cc63c1a4533f8e99cb535f30e67e5499.tar.gz chromium_src-3266c2b9cc63c1a4533f8e99cb535f30e67e5499.tar.bz2 | |
Add status area to Aura builds.
BUG=97263
TEST=Test status area buttons and associated menus in aura + win / linux / chromeos. (Only the clock and --memory-widget icon will show up on non-chromeos)
Review URL: http://codereview.chromium.org/8509027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109841 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura_shell/examples/aura_shell_main.cc')
| -rw-r--r-- | ui/aura_shell/examples/aura_shell_main.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ui/aura_shell/examples/aura_shell_main.cc b/ui/aura_shell/examples/aura_shell_main.cc index 414bcdd..20a3623 100644 --- a/ui/aura_shell/examples/aura_shell_main.cc +++ b/ui/aura_shell/examples/aura_shell_main.cc @@ -31,6 +31,10 @@ class ShellDelegateImpl : public aura_shell::ShellDelegate { aura_shell::examples::ToplevelWindow::CreateToplevelWindow(create_params); } + virtual views::Widget* CreateStatusArea() OVERRIDE { + return aura_shell::internal::CreateStatusArea(); + } + virtual void ShowApps() OVERRIDE { NOTIMPLEMENTED(); } @@ -72,7 +76,7 @@ int main(int argc, char** argv) { MessageLoop message_loop(MessageLoop::TYPE_UI); ui::CompositorTestSupport::Initialize(); - aura_shell::Shell::GetInstance()->SetDelegate(new ShellDelegateImpl);; + aura_shell::Shell::CreateInstance(new ShellDelegateImpl); aura_shell::examples::InitWindowTypeLauncher(); @@ -84,4 +88,3 @@ int main(int argc, char** argv) { return 0; } - |