| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "ui/views/examples/content_client/examples_browser_main_parts.h" | 5 #include "ui/views/examples/content_client/examples_browser_main_parts.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
| 10 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 void ExamplesBrowserMainParts::PreMainMessageLoopRun() { | 55 void ExamplesBrowserMainParts::PreMainMessageLoopRun() { |
| 56 browser_context_.reset(new content::ShellBrowserContext(false)); | 56 browser_context_.reset(new content::ShellBrowserContext(false)); |
| 57 | 57 |
| 58 #if defined(USE_AURA) | 58 #if defined(USE_AURA) |
| 59 aura::Env::GetInstance()->SetDisplayManager(new aura::SingleDisplayManager); | 59 aura::Env::GetInstance()->SetDisplayManager(new aura::SingleDisplayManager); |
| 60 stacking_client_.reset(new aura::DesktopStackingClient); | 60 stacking_client_.reset(new aura::DesktopStackingClient); |
| 61 gfx::Screen::SetInstance(aura::CreateDesktopScreen()); | 61 gfx::Screen::SetInstance(aura::CreateDesktopScreen()); |
| 62 #endif | 62 #endif |
| 63 views_delegate_.reset(new ExamplesViewsDelegate); | 63 views_delegate_.reset(new ExamplesViewsDelegate); |
| 64 | 64 |
| 65 ShowExamplesWindow(QUIT_ON_CLOSE, browser_context_.get()); | 65 ShowExamplesWindowWithContent(QUIT_ON_CLOSE, browser_context_.get()); |
| 66 } | 66 } |
| 67 | 67 |
| 68 void ExamplesBrowserMainParts::PostMainMessageLoopRun() { | 68 void ExamplesBrowserMainParts::PostMainMessageLoopRun() { |
| 69 browser_context_.reset(); | 69 browser_context_.reset(); |
| 70 views_delegate_.reset(); | 70 views_delegate_.reset(); |
| 71 #if defined(USE_AURA) | 71 #if defined(USE_AURA) |
| 72 stacking_client_.reset(); | 72 stacking_client_.reset(); |
| 73 aura::Env::DeleteInstance(); | 73 aura::Env::DeleteInstance(); |
| 74 #endif | 74 #endif |
| 75 } | 75 } |
| 76 | 76 |
| 77 bool ExamplesBrowserMainParts::MainMessageLoopRun(int* result_code) { | 77 bool ExamplesBrowserMainParts::MainMessageLoopRun(int* result_code) { |
| 78 // xxx: Hax here because this kills event handling. | 78 // xxx: Hax here because this kills event handling. |
| 79 #if !defined(USE_AURA) | 79 #if !defined(USE_AURA) |
| 80 AcceleratorHandler accelerator_handler; | 80 AcceleratorHandler accelerator_handler; |
| 81 base::RunLoop run_loop(&accelerator_handler); | 81 base::RunLoop run_loop(&accelerator_handler); |
| 82 #else | 82 #else |
| 83 base::RunLoop run_loop; | 83 base::RunLoop run_loop; |
| 84 #endif | 84 #endif |
| 85 run_loop.Run(); | 85 run_loop.Run(); |
| 86 return true; | 86 return true; |
| 87 } | 87 } |
| 88 | 88 |
| 89 } // namespace examples | 89 } // namespace examples |
| 90 } // namespace views | 90 } // namespace views |
| OLD | NEW |