OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "apps/shell/shell_browser_main_parts.h" | 5 #include "apps/shell/shell_browser_main_parts.h" |
6 | 6 |
7 #include "apps/shell/shell_browser_context.h" | 7 #include "apps/shell/shell_browser_context.h" |
8 #include "apps/shell/shell_extension_system.h" | 8 #include "apps/shell/shell_extension_system.h" |
9 #include "apps/shell/shell_extensions_browser_client.h" | 9 #include "apps/shell/shell_extensions_browser_client.h" |
10 #include "apps/shell/shell_extensions_client.h" | 10 #include "apps/shell/shell_extensions_client.h" |
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
116 extensions::ExtensionsBrowserClient::Set(NULL); | 116 extensions::ExtensionsBrowserClient::Set(NULL); |
117 extensions_browser_client_.reset(); | 117 extensions_browser_client_.reset(); |
118 browser_context_.reset(); | 118 browser_context_.reset(); |
119 aura::Env::DeleteInstance(); | 119 aura::Env::DeleteInstance(); |
120 | 120 |
121 LOG(WARNING) << "-----------------------------------"; | 121 LOG(WARNING) << "-----------------------------------"; |
122 LOG(WARNING) << "app_shell is expected to crash now."; | 122 LOG(WARNING) << "app_shell is expected to crash now."; |
123 LOG(WARNING) << "-----------------------------------"; | 123 LOG(WARNING) << "-----------------------------------"; |
124 } | 124 } |
125 | 125 |
126 void ShellBrowserMainParts::OnRootWindowHostCloseRequested( | 126 void ShellBrowserMainParts::OnWindowTreeHostCloseRequested( |
127 const aura::RootWindow* root) { | 127 const aura::RootWindow* root) { |
128 base::MessageLoop::current()->PostTask(FROM_HERE, | 128 base::MessageLoop::current()->PostTask(FROM_HERE, |
129 base::MessageLoop::QuitClosure()); | 129 base::MessageLoop::QuitClosure()); |
130 } | 130 } |
131 | 131 |
132 void ShellBrowserMainParts::CreateRootWindow() { | 132 void ShellBrowserMainParts::CreateRootWindow() { |
133 test_screen_.reset(aura::TestScreen::Create()); | 133 test_screen_.reset(aura::TestScreen::Create()); |
134 // TODO(jamescook): Replace this with a real Screen implementation. | 134 // TODO(jamescook): Replace this with a real Screen implementation. |
135 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen_.get()); | 135 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen_.get()); |
136 // Set up basic pieces of views::corewm. | 136 // Set up basic pieces of views::corewm. |
(...skipping 15 matching lines...) Expand all Loading... |
152 extension_system_ = | 152 extension_system_ = |
153 new extensions::ShellExtensionSystem(browser_context_.get()); | 153 new extensions::ShellExtensionSystem(browser_context_.get()); |
154 extensions::ExtensionSystemFactory::GetInstance()->SetCustomInstance( | 154 extensions::ExtensionSystemFactory::GetInstance()->SetCustomInstance( |
155 extension_system_); | 155 extension_system_); |
156 // Must occur after setting the instance above, as it will end up calling | 156 // Must occur after setting the instance above, as it will end up calling |
157 // ExtensionSystem::Get(). | 157 // ExtensionSystem::Get(). |
158 extension_system_->InitForRegularProfile(true); | 158 extension_system_->InitForRegularProfile(true); |
159 } | 159 } |
160 | 160 |
161 } // namespace apps | 161 } // namespace apps |
OLD | NEW |