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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/update_screen_handler.cc

Issue 2684473002: Revert of Fold UpdateModel into UpdateScreen. (Closed)
Patch Set: Created 3 years, 10 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
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/update_screen_handler.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "chrome/browser/ui/webui/chromeos/login/update_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/update_screen_handler.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/browser/chromeos/login/oobe_screen.h" 10 #include "chrome/browser/chromeos/login/oobe_screen.h"
11 #include "chrome/browser/chromeos/login/screens/update_screen.h" 11 #include "chrome/browser/chromeos/login/screens/update_model.h"
12 #include "chrome/grit/chromium_strings.h" 12 #include "chrome/grit/chromium_strings.h"
13 #include "chrome/grit/generated_resources.h" 13 #include "chrome/grit/generated_resources.h"
14 #include "components/login/localized_values_builder.h" 14 #include "components/login/localized_values_builder.h"
15 15
16 namespace { 16 namespace {
17 17
18 const char kJsScreenPath[] = "login.UpdateScreen"; 18 const char kJsScreenPath[] = "login.UpdateScreen";
19 19
20 } // namespace 20 } // namespace
21 21
22 namespace chromeos { 22 namespace chromeos {
23 23
24 UpdateScreenHandler::UpdateScreenHandler() : BaseScreenHandler(kJsScreenPath) {} 24 UpdateScreenHandler::UpdateScreenHandler()
25 : BaseScreenHandler(kJsScreenPath), model_(nullptr), show_on_init_(false) {
26 }
25 27
26 UpdateScreenHandler::~UpdateScreenHandler() { 28 UpdateScreenHandler::~UpdateScreenHandler() {
27 if (screen_) 29 if (model_)
28 screen_->OnViewDestroyed(this); 30 model_->OnViewDestroyed(this);
29 } 31 }
30 32
31 void UpdateScreenHandler::DeclareLocalizedValues( 33 void UpdateScreenHandler::DeclareLocalizedValues(
32 ::login::LocalizedValuesBuilder* builder) { 34 ::login::LocalizedValuesBuilder* builder) {
33 builder->Add("checkingForUpdatesMsg", IDS_CHECKING_FOR_UPDATE_MSG); 35 builder->Add("checkingForUpdatesMsg", IDS_CHECKING_FOR_UPDATE_MSG);
34 builder->Add("installingUpdateDesc", IDS_UPDATE_MSG); 36 builder->Add("installingUpdateDesc", IDS_UPDATE_MSG);
35 builder->Add("updateScreenTitle", IDS_UPDATE_SCREEN_TITLE); 37 builder->Add("updateScreenTitle", IDS_UPDATE_SCREEN_TITLE);
36 builder->Add("updateScreenAccessibleTitle", 38 builder->Add("updateScreenAccessibleTitle",
37 IDS_UPDATE_SCREEN_ACCESSIBLE_TITLE); 39 IDS_UPDATE_SCREEN_ACCESSIBLE_TITLE);
38 builder->Add("checkingForUpdates", IDS_CHECKING_FOR_UPDATES); 40 builder->Add("checkingForUpdates", IDS_CHECKING_FOR_UPDATES);
(...skipping 28 matching lines...) Expand all
67 if (!page_is_ready()) { 69 if (!page_is_ready()) {
68 show_on_init_ = true; 70 show_on_init_ = true;
69 return; 71 return;
70 } 72 }
71 ShowScreen(OobeScreen::SCREEN_OOBE_UPDATE); 73 ShowScreen(OobeScreen::SCREEN_OOBE_UPDATE);
72 } 74 }
73 75
74 void UpdateScreenHandler::Hide() { 76 void UpdateScreenHandler::Hide() {
75 } 77 }
76 78
77 void UpdateScreenHandler::Bind(UpdateScreen* screen) { 79 void UpdateScreenHandler::Bind(UpdateModel& model) {
78 screen_ = screen; 80 model_ = &model;
79 BaseScreenHandler::SetBaseScreen(screen_); 81 BaseScreenHandler::SetBaseScreen(model_);
80 } 82 }
81 83
82 void UpdateScreenHandler::Unbind() { 84 void UpdateScreenHandler::Unbind() {
83 screen_ = nullptr; 85 model_ = nullptr;
84 BaseScreenHandler::SetBaseScreen(nullptr); 86 BaseScreenHandler::SetBaseScreen(nullptr);
85 } 87 }
86 88
87 } // namespace chromeos 89 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/update_screen_handler.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698