Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(771)

Side by Side Diff: chrome/browser/chromeos/login/screens/base_screen.cc

Issue 2633413002: cros: Remove BaseScreen::Initialize method. (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 context_.SetString16List(key, value); 66 context_.SetString16List(key, value);
67 return *this; 67 return *this;
68 } 68 }
69 69
70 BaseScreen::BaseScreen(BaseScreenDelegate* base_screen_delegate, 70 BaseScreen::BaseScreen(BaseScreenDelegate* base_screen_delegate,
71 OobeScreen screen_id) 71 OobeScreen screen_id)
72 : base_screen_delegate_(base_screen_delegate), screen_id_(screen_id) {} 72 : base_screen_delegate_(base_screen_delegate), screen_id_(screen_id) {}
73 73
74 BaseScreen::~BaseScreen() {} 74 BaseScreen::~BaseScreen() {}
75 75
76 void BaseScreen::Initialize(::login::ScreenContext* context) { 76 void BaseScreen::OnShow() {}
77 if (context)
78 context_.CopyFrom(*context);
79 }
80 77
81 void BaseScreen::OnShow() { 78 void BaseScreen::OnHide() {}
82 }
83 79
84 void BaseScreen::OnHide() { 80 void BaseScreen::OnClose() {}
85 }
86
87 void BaseScreen::OnClose() {
88 }
89 81
90 bool BaseScreen::IsStatusAreaDisplayed() { 82 bool BaseScreen::IsStatusAreaDisplayed() {
91 return true; 83 return true;
92 } 84 }
93 85
94 void BaseScreen::CommitContextChanges() { 86 void BaseScreen::CommitContextChanges() {
95 if (!context_.HasChanges()) 87 if (!context_.HasChanges())
96 return; 88 return;
97 if (!channel_) { 89 if (!channel_) {
98 LOG(ERROR) << "Model-view channel for " << GetOobeScreenName(screen_id()) 90 LOG(ERROR) << "Model-view channel for " << GetOobeScreenName(screen_id())
(...skipping 28 matching lines...) Expand all
127 } 119 }
128 120
129 void BaseScreen::OnContextChanged(const base::DictionaryValue& diff) { 121 void BaseScreen::OnContextChanged(const base::DictionaryValue& diff) {
130 std::vector<::login::ScreenContext::KeyType> keys; 122 std::vector<::login::ScreenContext::KeyType> keys;
131 context_.ApplyChanges(diff, &keys); 123 context_.ApplyChanges(diff, &keys);
132 for (const auto& key : keys) 124 for (const auto& key : keys)
133 OnContextKeyUpdated(key); 125 OnContextKeyUpdated(key);
134 } 126 }
135 127
136 } // namespace chromeos 128 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/screens/base_screen.h ('k') | chrome/browser/chromeos/login/screens/hid_detection_screen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698