| Index: ui/aura/demo/demo_main.cc
|
| diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc
|
| index 6a6d43b5b6bd327efd65a03c2fa43eb04549841c..e30b2e4584999462771fdbeb75d7f2f0bea14b7c 100644
|
| --- a/ui/aura/demo/demo_main.cc
|
| +++ b/ui/aura/demo/demo_main.cc
|
| @@ -27,8 +27,6 @@
|
| #include "base/message_pump_aurax11.h"
|
| #endif
|
|
|
| -extern int ViewerProcessMain();
|
| -
|
| namespace {
|
|
|
| // Trivial WindowDelegate implementation that draws a colored background.
|
| @@ -163,15 +161,6 @@ int DemoMain() {
|
| return 0;
|
| }
|
|
|
| -int RunMain() {
|
| - // TODO(scottmg): Something not crappy.
|
| - if (CommandLine::ForCurrentProcess()->HasSwitch("viewer")) {
|
| - return ViewerProcessMain();
|
| - } else {
|
| - return DemoMain();
|
| - }
|
| -}
|
| -
|
| } // namespace
|
|
|
| int main(int argc, char** argv) {
|
| @@ -184,5 +173,5 @@ int main(int argc, char** argv) {
|
| icu_util::Initialize();
|
| ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
|
|
|
| - return RunMain();
|
| + return DemoMain();
|
| }
|
|
|