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

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

Issue 1995113002: Rename WebUI::CallJavascriptFunction to WebUI::CallJavascriptFunctionUnsafe (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 if (!page_is_ready()) 62 if (!page_is_ready())
63 pending_context_changes_.MergeDictionary(&diff); 63 pending_context_changes_.MergeDictionary(&diff);
64 else 64 else
65 CallJS(kMethodContextChanged, diff); 65 CallJS(kMethodContextChanged, diff);
66 } 66 }
67 67
68 void BaseScreenHandler::GetAdditionalParameters(base::DictionaryValue* dict) { 68 void BaseScreenHandler::GetAdditionalParameters(base::DictionaryValue* dict) {
69 } 69 }
70 70
71 void BaseScreenHandler::CallJS(const std::string& method) { 71 void BaseScreenHandler::CallJS(const std::string& method) {
72 web_ui()->CallJavascriptFunction(FullMethodPath(method)); 72 web_ui()->CallJavascriptFunctionUnsafe(FullMethodPath(method));
73 } 73 }
74 74
75 void BaseScreenHandler::ShowScreen(OobeScreen screen) { 75 void BaseScreenHandler::ShowScreen(OobeScreen screen) {
76 ShowScreenWithData(screen, nullptr); 76 ShowScreenWithData(screen, nullptr);
77 } 77 }
78 78
79 void BaseScreenHandler::ShowScreenWithData(OobeScreen screen, 79 void BaseScreenHandler::ShowScreenWithData(OobeScreen screen,
80 const base::DictionaryValue* data) { 80 const base::DictionaryValue* data) {
81 if (!web_ui()) 81 if (!web_ui())
82 return; 82 return;
83 base::DictionaryValue screen_params; 83 base::DictionaryValue screen_params;
84 screen_params.SetString("id", GetOobeScreenName(screen)); 84 screen_params.SetString("id", GetOobeScreenName(screen));
85 if (data) 85 if (data)
86 screen_params.SetWithoutPathExpansion("data", data->DeepCopy()); 86 screen_params.SetWithoutPathExpansion("data", data->DeepCopy());
87 web_ui()->CallJavascriptFunction("cr.ui.Oobe.showScreen", screen_params); 87 web_ui()->CallJavascriptFunctionUnsafe("cr.ui.Oobe.showScreen",
88 screen_params);
88 } 89 }
89 90
90 OobeScreen BaseScreenHandler::GetCurrentScreen() const { 91 OobeScreen BaseScreenHandler::GetCurrentScreen() const {
91 OobeUI* oobe_ui = static_cast<OobeUI*>(web_ui()->GetController()); 92 OobeUI* oobe_ui = static_cast<OobeUI*>(web_ui()->GetController());
92 if (!oobe_ui) 93 if (!oobe_ui)
93 return OobeScreen::SCREEN_UNKNOWN; 94 return OobeScreen::SCREEN_UNKNOWN;
94 return oobe_ui->current_screen(); 95 return oobe_ui->current_screen();
95 } 96 }
96 97
97 gfx::NativeWindow BaseScreenHandler::GetNativeWindow() { 98 gfx::NativeWindow BaseScreenHandler::GetNativeWindow() {
(...skipping 20 matching lines...) Expand all
118 base_screen_->OnUserAction(action_id); 119 base_screen_->OnUserAction(action_id);
119 } 120 }
120 121
121 void BaseScreenHandler::HandleContextChanged( 122 void BaseScreenHandler::HandleContextChanged(
122 const base::DictionaryValue* diff) { 123 const base::DictionaryValue* diff) {
123 if (diff && base_screen_) 124 if (diff && base_screen_)
124 base_screen_->OnContextChanged(*diff); 125 base_screen_->OnContextChanged(*diff);
125 } 126 }
126 127
127 } // namespace chromeos 128 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698