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

Unified Diff: ui/aura_shell/examples/aura_shell_main.cc

Issue 8509027: Add status area to Aura builds. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move status area view ids back to chromeos 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/chrome_switches.cc ('k') | ui/aura_shell/shell.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura_shell/examples/aura_shell_main.cc
diff --git a/ui/aura_shell/examples/aura_shell_main.cc b/ui/aura_shell/examples/aura_shell_main.cc
index 414bcdddbfc813ab44edd8b6cbce92321d9eb698..20a3623b6ff172ef82940e3118081960abeed4b7 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;
}
-
« no previous file with comments | « chrome/common/chrome_switches.cc ('k') | ui/aura_shell/shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698