Commit 14938294 authored by Michael Giuffrida's avatar Michael Giuffrida Committed by Commit Bot

Modernize handlers in WebUI doc

Message handlers should call AllowJavascript() and shouldn't used
deprecated base::Value methods.

Bug: None
Change-Id: I88ededca440d800bff6ded8bc3f1078c7c83f78f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1637647
Auto-Submit: Michael Giuffrida <michaelpg@chromium.org>
Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
Reviewed-by: default avatarDemetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#665280}
parent 6522ddf2
...@@ -219,8 +219,11 @@ void OvenHandler::RegisterMessages() { ...@@ -219,8 +219,11 @@ void OvenHandler::RegisterMessages() {
} }
void OverHandler::HandleBakeDonuts(const base::ListValue* args) { void OverHandler::HandleBakeDonuts(const base::ListValue* args) {
double num_donuts; AllowJavascript();
CHECK(args->GetDouble(0, &num_donuts)); // JavaScript numbers are doubles.
CHECK_EQ(1u, args->GetSize());
// JavaScript numbers are doubles.
double num_donuts = args->GetList()[0].GetDouble();
GetOven()->BakeDonuts(static_cast<int>(num_donuts)); GetOven()->BakeDonuts(static_cast<int>(num_donuts));
} }
``` ```
...@@ -429,7 +432,7 @@ There's a number of situations that result in this method being called: ...@@ -429,7 +432,7 @@ There's a number of situations that result in this method being called:
* renderer doesn't exist yet * renderer doesn't exist yet
* renderer exists but isn't ready * renderer exists but isn't ready
* renderer is ready but application-specifici JS isn't ready yet * renderer is ready but application-specific JS isn't ready yet
* tab refresh * tab refresh
* renderer crash * renderer crash
...@@ -467,12 +470,11 @@ callbacks in the chain. ...@@ -467,12 +470,11 @@ callbacks in the chain.
```c++ ```c++
void OvenHandler::HandleBakeDonuts(const base::ListValue* args) { void OvenHandler::HandleBakeDonuts(const base::ListValue* args) {
base::Value* callback_id; AllowJavascript();
args->Get(0, &callback_id); if (!GetOven()->HasGas()) {
if (!GetOven()->HasGas()) { RejectJavascriptCallback(args->GetList()[0],
RejectJavascriptCallback(callback_id, base::StringValue("need gas to cook the donuts!"));
base::StringValue("need gas to cook the donuts!")); }
}
``` ```
This method is basically just a This method is basically just a
...@@ -509,10 +511,9 @@ Some handling C++ might do this: ...@@ -509,10 +511,9 @@ Some handling C++ might do this:
```c++ ```c++
void OvenHandler::HandleBakeDonuts(const base::ListValue* args) { void OvenHandler::HandleBakeDonuts(const base::ListValue* args) {
base::Value* callback_id; AllowJavascript();
args->Get(0, &callback_id);
double num_donuts_baked = GetOven()->BakeDonuts(); double num_donuts_baked = GetOven()->BakeDonuts();
ResolveJavascriptCallback(*callback_id, num_donuts_baked); ResolveJavascriptCallback(args->GetList()[0], num_donuts_baked);
} }
``` ```
...@@ -649,10 +650,11 @@ JavaScript and calling the `then()` function. ...@@ -649,10 +650,11 @@ JavaScript and calling the `then()` function.
```c++ ```c++
void DonutHandler::HandleGetNumberOfDonuts(const base::ListValue* args) { void DonutHandler::HandleGetNumberOfDonuts(const base::ListValue* args) {
base::Value* callback_id; AllowJavascript();
args->Get(0, &callback_id);
const base::Value& callback_id = args->GetList()[0];
size_t num_donuts = GetOven()->GetNumberOfDonuts(); size_t num_donuts = GetOven()->GetNumberOfDonuts();
ResolveJavascriptCallback(*callback_id, base::FundamentalValue(num_donuts)); ResolveJavascriptCallback(callback_id, base::FundamentalValue(num_donuts));
} }
``` ```
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment