| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "chrome/browser/chromeos/login/screens/base_screen.h" | 5 #include "chrome/browser/chromeos/login/screens/base_screen.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "chrome/browser/chromeos/login/screens/base_screen_delegate.h" | 8 #include "chrome/browser/chromeos/login/screens/base_screen_delegate.h" |
| 9 #include "chrome/browser/chromeos/login/screens/model_view_channel.h" | 9 #include "chrome/browser/chromeos/login/screens/model_view_channel.h" |
| 10 | 10 |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 void BaseScreen::OnHide() { | 85 void BaseScreen::OnHide() { |
| 86 } | 86 } |
| 87 | 87 |
| 88 void BaseScreen::OnClose() { | 88 void BaseScreen::OnClose() { |
| 89 } | 89 } |
| 90 | 90 |
| 91 bool BaseScreen::IsStatusAreaDisplayed() { | 91 bool BaseScreen::IsStatusAreaDisplayed() { |
| 92 return true; | 92 return true; |
| 93 } | 93 } |
| 94 | 94 |
| 95 bool BaseScreen::IsPermanent() { | |
| 96 return false; | |
| 97 } | |
| 98 | |
| 99 std::string BaseScreen::GetID() const { | 95 std::string BaseScreen::GetID() const { |
| 100 // TODO (ygorshenin, crbug.com/433797): elimitate intermediate | 96 // TODO (ygorshenin, crbug.com/433797): elimitate intermediate |
| 101 // GetName() ASAP. | 97 // GetName() ASAP. |
| 102 return GetName(); | 98 return GetName(); |
| 103 } | 99 } |
| 104 | 100 |
| 105 void BaseScreen::CommitContextChanges() { | 101 void BaseScreen::CommitContextChanges() { |
| 106 if (!context_.HasChanges()) | 102 if (!context_.HasChanges()) |
| 107 return; | 103 return; |
| 108 if (!channel_) { | 104 if (!channel_) { |
| (...skipping 29 matching lines...) Expand all Loading... |
| 138 } | 134 } |
| 139 | 135 |
| 140 void BaseScreen::OnContextChanged(const base::DictionaryValue& diff) { | 136 void BaseScreen::OnContextChanged(const base::DictionaryValue& diff) { |
| 141 std::vector<::login::ScreenContext::KeyType> keys; | 137 std::vector<::login::ScreenContext::KeyType> keys; |
| 142 context_.ApplyChanges(diff, &keys); | 138 context_.ApplyChanges(diff, &keys); |
| 143 for (const auto& key : keys) | 139 for (const auto& key : keys) |
| 144 OnContextKeyUpdated(key); | 140 OnContextKeyUpdated(key); |
| 145 } | 141 } |
| 146 | 142 |
| 147 } // namespace chromeos | 143 } // namespace chromeos |
| OLD | NEW |