Skip to content

Commit

Permalink
Mojo C++ bindings: switch ios/web mojom targets to use STL types.
Browse files Browse the repository at this point in the history
BUG=624136

Review-Url: https://codereview.chromium.org/2496733002
Cr-Commit-Position: refs/heads/master@{#431407}
  • Loading branch information
yzshen authored and Commit bot committed Nov 11, 2016
1 parent 134f57f commit b6f82a3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
2 changes: 0 additions & 2 deletions ios/web/test/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ mojom("mojo_bindings") {
sources = [
"mojo_test.mojom",
]

use_new_wrapper_types = false
}

repack("packed_resources") {
Expand Down
8 changes: 4 additions & 4 deletions ios/web/webui/web_ui_mojo_inttest.mm
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,16 @@

// TestUIHandlerMojo overrides.
void SetClientPage(TestPagePtr page) override { page_ = std::move(page); }
void HandleJsMessage(const mojo::String& message) override {
if (message.get() == "syn") {
void HandleJsMessage(const std::string& message) override {
if (message == "syn") {
// Received "syn" message from WebUI page, send "ack" as reply.
DCHECK(!syn_received_);
DCHECK(!fin_received_);
syn_received_ = true;
NativeMessageResultMojoPtr result(NativeMessageResultMojo::New());
result->message = mojo::String::From("ack");
result->message = "ack";
page_->HandleNativeMessage(std::move(result));
} else if (message.get() == "fin") {
} else if (message == "fin") {
// Received "fin" from the WebUI page in response to "ack".
DCHECK(syn_received_);
DCHECK(!fin_received_);
Expand Down

0 comments on commit b6f82a3

Please sign in to comment.