| 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 "content/shell/shell.h" | 5 #include "content/shell/shell.h" |
| 6 | 6 |
| 7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
| 8 #include "ui/aura/desktop/desktop_screen.h" | 8 #include "ui/aura/desktop/desktop_screen.h" |
| 9 #include "ui/aura/desktop/desktop_stacking_client.h" | 9 #include "ui/aura/desktop/desktop_stacking_client.h" |
| 10 #include "ui/aura/display_manager.h" | 10 #include "ui/aura/display_manager.h" |
| (...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 333 void Shell::PlatformInitialize() { | 333 void Shell::PlatformInitialize() { |
| 334 #if defined(OS_CHROMEOS) | 334 #if defined(OS_CHROMEOS) |
| 335 chromeos::DBusThreadManager::Initialize(); | 335 chromeos::DBusThreadManager::Initialize(); |
| 336 #endif | 336 #endif |
| 337 aura::Env::GetInstance()->SetDisplayManager(new aura::SingleDisplayManager); | 337 aura::Env::GetInstance()->SetDisplayManager(new aura::SingleDisplayManager); |
| 338 stacking_client_ = new aura::DesktopStackingClient(); | 338 stacking_client_ = new aura::DesktopStackingClient(); |
| 339 gfx::Screen::SetInstance(aura::CreateDesktopScreen()); | 339 gfx::Screen::SetInstance(aura::CreateDesktopScreen()); |
| 340 views_delegate_ = new ShellViewsDelegateAura(); | 340 views_delegate_ = new ShellViewsDelegateAura(); |
| 341 } | 341 } |
| 342 | 342 |
| 343 base::StringPiece Shell::PlatformResourceProvider(int key) { | |
| 344 return base::StringPiece(); | |
| 345 } | |
| 346 | |
| 347 void Shell::PlatformExit() { | 343 void Shell::PlatformExit() { |
| 348 #if defined(OS_CHROMEOS) | 344 #if defined(OS_CHROMEOS) |
| 349 chromeos::DBusThreadManager::Shutdown(); | 345 chromeos::DBusThreadManager::Shutdown(); |
| 350 #endif | 346 #endif |
| 351 if (stacking_client_) | 347 if (stacking_client_) |
| 352 delete stacking_client_; | 348 delete stacking_client_; |
| 353 if (views_delegate_) | 349 if (views_delegate_) |
| 354 delete views_delegate_; | 350 delete views_delegate_; |
| 355 aura::Env::DeleteInstance(); | 351 aura::Env::DeleteInstance(); |
| 356 } | 352 } |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 404 } | 400 } |
| 405 | 401 |
| 406 void Shell::PlatformSetTitle(const string16& title) { | 402 void Shell::PlatformSetTitle(const string16& title) { |
| 407 ShellWindowDelegateView* delegate_view = | 403 ShellWindowDelegateView* delegate_view = |
| 408 static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate()); | 404 static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate()); |
| 409 delegate_view->SetWindowTitle(title); | 405 delegate_view->SetWindowTitle(title); |
| 410 window_widget_->UpdateWindowTitle(); | 406 window_widget_->UpdateWindowTitle(); |
| 411 } | 407 } |
| 412 | 408 |
| 413 } // namespace content | 409 } // namespace content |
| OLD | NEW |