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

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

Issue 2429033003: cros: Cleanup lock screen and OOBE C++ backing code. (Closed)
Patch Set: Address comments Created 4 years, 2 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) 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/base_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/ptr_util.h" 8 #include "base/memory/ptr_util.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/browser/chromeos/login/screens/base_screen.h" 10 #include "chrome/browser/chromeos/login/screens/base_screen.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 if (!web_ui()) 80 if (!web_ui())
81 return; 81 return;
82 base::DictionaryValue screen_params; 82 base::DictionaryValue screen_params;
83 screen_params.SetString("id", GetOobeScreenName(screen)); 83 screen_params.SetString("id", GetOobeScreenName(screen));
84 if (data) 84 if (data)
85 screen_params.SetWithoutPathExpansion("data", data->DeepCopy()); 85 screen_params.SetWithoutPathExpansion("data", data->DeepCopy());
86 web_ui()->CallJavascriptFunctionUnsafe("cr.ui.Oobe.showScreen", 86 web_ui()->CallJavascriptFunctionUnsafe("cr.ui.Oobe.showScreen",
87 screen_params); 87 screen_params);
88 } 88 }
89 89
90 OobeUI* BaseScreenHandler::GetOobeUI() const {
91 return static_cast<OobeUI*>(web_ui()->GetController());
92 }
93
90 OobeScreen BaseScreenHandler::GetCurrentScreen() const { 94 OobeScreen BaseScreenHandler::GetCurrentScreen() const {
91 OobeUI* oobe_ui = static_cast<OobeUI*>(web_ui()->GetController()); 95 OobeUI* oobe_ui = GetOobeUI();
92 if (!oobe_ui) 96 if (!oobe_ui)
93 return OobeScreen::SCREEN_UNKNOWN; 97 return OobeScreen::SCREEN_UNKNOWN;
94 return oobe_ui->current_screen(); 98 return oobe_ui->current_screen();
95 } 99 }
96 100
97 gfx::NativeWindow BaseScreenHandler::GetNativeWindow() { 101 gfx::NativeWindow BaseScreenHandler::GetNativeWindow() {
98 return LoginDisplayHost::default_host()->GetNativeWindow(); 102 return LoginDisplayHost::default_host()->GetNativeWindow();
99 } 103 }
100 104
101 void BaseScreenHandler::SetBaseScreen(BaseScreen* base_screen) { 105 void BaseScreenHandler::SetBaseScreen(BaseScreen* base_screen) {
(...skipping 16 matching lines...) Expand all
118 base_screen_->OnUserAction(action_id); 122 base_screen_->OnUserAction(action_id);
119 } 123 }
120 124
121 void BaseScreenHandler::HandleContextChanged( 125 void BaseScreenHandler::HandleContextChanged(
122 const base::DictionaryValue* diff) { 126 const base::DictionaryValue* diff) {
123 if (diff && base_screen_) 127 if (diff && base_screen_)
124 base_screen_->OnContextChanged(*diff); 128 base_screen_->OnContextChanged(*diff);
125 } 129 }
126 130
127 } // namespace chromeos 131 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698