| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/aura/mus/in_flight_change.h" | 5 #include "ui/aura/mus/in_flight_change.h" |
| 6 | 6 |
| 7 #include "ui/aura/client/aura_constants.h" | 7 #include "ui/aura/client/aura_constants.h" |
| 8 #include "ui/aura/mus/capture_synchronizer.h" | 8 #include "ui/aura/mus/capture_synchronizer.h" |
| 9 #include "ui/aura/mus/focus_synchronizer.h" | 9 #include "ui/aura/mus/focus_synchronizer.h" |
| 10 #include "ui/aura/mus/window_mus.h" | 10 #include "ui/aura/mus/window_mus.h" |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 CrashInFlightChange::CrashInFlightChange(WindowMus* window, ChangeType type) | 63 CrashInFlightChange::CrashInFlightChange(WindowMus* window, ChangeType type) |
| 64 : InFlightChange(window, type) {} | 64 : InFlightChange(window, type) {} |
| 65 | 65 |
| 66 CrashInFlightChange::~CrashInFlightChange() {} | 66 CrashInFlightChange::~CrashInFlightChange() {} |
| 67 | 67 |
| 68 void CrashInFlightChange::SetRevertValueFrom(const InFlightChange& change) { | 68 void CrashInFlightChange::SetRevertValueFrom(const InFlightChange& change) { |
| 69 CHECK(false); | 69 CHECK(false); |
| 70 } | 70 } |
| 71 | 71 |
| 72 void CrashInFlightChange::ChangeFailed() { | 72 void CrashInFlightChange::ChangeFailed() { |
| 73 DLOG(ERROR) << "changed failed, type=" << static_cast<int>(change_type()); | 73 DLOG(ERROR) << "change failed, type=" << static_cast<int>(change_type()); |
| 74 CHECK(false); | 74 CHECK(false); |
| 75 } | 75 } |
| 76 | 76 |
| 77 void CrashInFlightChange::Revert() { | 77 void CrashInFlightChange::Revert() { |
| 78 CHECK(false); | 78 CHECK(false); |
| 79 } | 79 } |
| 80 | 80 |
| 81 // InFlightWindowChange ------------------------------------------------------- | 81 // InFlightWindowChange ------------------------------------------------------- |
| 82 | 82 |
| 83 InFlightWindowTreeClientChange::InFlightWindowTreeClientChange( | 83 InFlightWindowTreeClientChange::InFlightWindowTreeClientChange( |
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 239 InFlightSetModalChange::~InFlightSetModalChange() {} | 239 InFlightSetModalChange::~InFlightSetModalChange() {} |
| 240 | 240 |
| 241 void InFlightSetModalChange::SetRevertValueFrom(const InFlightChange& change) {} | 241 void InFlightSetModalChange::SetRevertValueFrom(const InFlightChange& change) {} |
| 242 | 242 |
| 243 void InFlightSetModalChange::Revert() { | 243 void InFlightSetModalChange::Revert() { |
| 244 // TODO: need to support more than just off. http://crbug.com/660073. | 244 // TODO: need to support more than just off. http://crbug.com/660073. |
| 245 window()->GetWindow()->SetProperty(client::kModalKey, ui::MODAL_TYPE_NONE); | 245 window()->GetWindow()->SetProperty(client::kModalKey, ui::MODAL_TYPE_NONE); |
| 246 } | 246 } |
| 247 | 247 |
| 248 } // namespace aura | 248 } // namespace aura |
| OLD | NEW |