| 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 "ash/shell.h" | 5 #include "ash/shell.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 332 } | 332 } |
| 333 | 333 |
| 334 views::NonClientFrameView* Shell::CreateDefaultNonClientFrameView( | 334 views::NonClientFrameView* Shell::CreateDefaultNonClientFrameView( |
| 335 views::Widget* widget) { | 335 views::Widget* widget) { |
| 336 // Use translucent-style window frames for dialogs. | 336 // Use translucent-style window frames for dialogs. |
| 337 return new CustomFrameViewAsh(widget); | 337 return new CustomFrameViewAsh(widget); |
| 338 } | 338 } |
| 339 | 339 |
| 340 void Shell::SetDisplayWorkAreaInsets(Window* contains, | 340 void Shell::SetDisplayWorkAreaInsets(Window* contains, |
| 341 const gfx::Insets& insets) { | 341 const gfx::Insets& insets) { |
| 342 shell_port_->SetDisplayWorkAreaInsets(WmWindow::Get(contains), insets); | 342 shell_port_->SetDisplayWorkAreaInsets(contains, insets); |
| 343 } | 343 } |
| 344 | 344 |
| 345 void Shell::OnCastingSessionStartedOrStopped(bool started) { | 345 void Shell::OnCastingSessionStartedOrStopped(bool started) { |
| 346 for (auto& observer : shell_observers_) | 346 for (auto& observer : shell_observers_) |
| 347 observer.OnCastingSessionStartedOrStopped(started); | 347 observer.OnCastingSessionStartedOrStopped(started); |
| 348 } | 348 } |
| 349 | 349 |
| 350 void Shell::OnRootWindowAdded(aura::Window* root_window) { | 350 void Shell::OnRootWindowAdded(aura::Window* root_window) { |
| 351 for (auto& observer : shell_observers_) | 351 for (auto& observer : shell_observers_) |
| 352 observer.OnRootWindowAdded(root_window); | 352 observer.OnRootWindowAdded(root_window); |
| (...skipping 915 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1268 void Shell::OnPrefServiceInitialized( | 1268 void Shell::OnPrefServiceInitialized( |
| 1269 std::unique_ptr<::PrefService> pref_service) { | 1269 std::unique_ptr<::PrefService> pref_service) { |
| 1270 if (!instance_) | 1270 if (!instance_) |
| 1271 return; | 1271 return; |
| 1272 // |pref_service_| is null if can't connect to Chrome (as happens when | 1272 // |pref_service_| is null if can't connect to Chrome (as happens when |
| 1273 // running mash outside of chrome --mash and chrome isn't built). | 1273 // running mash outside of chrome --mash and chrome isn't built). |
| 1274 pref_service_ = std::move(pref_service); | 1274 pref_service_ = std::move(pref_service); |
| 1275 } | 1275 } |
| 1276 | 1276 |
| 1277 } // namespace ash | 1277 } // namespace ash |
| OLD | NEW |