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

Unified Diff: components/web_view/frame.cc

Issue 1527183003: Change mojo enums to be scoped enums in the generated C++ bindings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mojo-binding-equals
Patch Set: rebase Created 4 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/pdf_viewer/pdf_viewer.cc ('k') | components/web_view/frame_apptest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/web_view/frame.cc
diff --git a/components/web_view/frame.cc b/components/web_view/frame.cc
index 453382ba53d2fe0f940f137359931accc7b56326..4581c807f567f72ab114961ec2b53795ecfcea72 100644
--- a/components/web_view/frame.cc
+++ b/components/web_view/frame.cc
@@ -201,7 +201,7 @@ void Frame::InitClient(ClientType client_type,
embed_weak_ptr_factory_.InvalidateWeakPtrs();
window_->Embed(
std::move(window_tree_client),
- mus::mojom::WindowTree::ACCESS_POLICY_DEFAULT,
+ mus::mojom::WindowTree::kAccessPolicyDefault,
base::Bind(&Frame::OnEmbedAck, embed_weak_ptr_factory_.GetWeakPtr()));
}
@@ -213,7 +213,7 @@ void Frame::InitClient(ClientType client_type,
frame_binding_.reset(
new mojo::Binding<mojom::Frame>(this, std::move(frame_request)));
frame_client_->OnConnect(
- nullptr, tree_->change_id(), id_, mojom::WINDOW_CONNECT_TYPE_USE_NEW,
+ nullptr, tree_->change_id(), id_, mojom::WindowConnectType::USE_NEW,
mojo::Array<mojom::FrameDataPtr>(),
navigation_start_time.ToInternalValue(),
base::Bind(&OnConnectAck, base::Passed(&data_and_binding)));
@@ -233,8 +233,8 @@ void Frame::InitClient(ClientType client_type,
frame_client_->OnConnect(
std::move(frame_ptr), tree_->change_id(), id_,
client_type == ClientType::EXISTING_FRAME_SAME_APP
- ? mojom::WINDOW_CONNECT_TYPE_USE_EXISTING
- : mojom::WINDOW_CONNECT_TYPE_USE_NEW,
+ ? mojom::WindowConnectType::USE_EXISTING
+ : mojom::WindowConnectType::USE_NEW,
std::move(array), navigation_start_time.ToInternalValue(),
base::Bind(&OnConnectAck, base::Passed(&data_and_binding)));
tree_->delegate_->DidStartNavigation(this);
@@ -563,7 +563,7 @@ void Frame::OnCreatedFrame(
void Frame::RequestNavigate(mojom::NavigationTargetType target_type,
uint32_t target_frame_id,
mojo::URLRequestPtr request) {
- if (target_type == mojom::NAVIGATION_TARGET_TYPE_EXISTING_FRAME) {
+ if (target_type == mojom::NavigationTargetType::EXISTING_FRAME) {
// |target_frame| is allowed to come from another connection.
Frame* target_frame = tree_->root()->FindFrame(target_frame_id);
if (!target_frame) {
« no previous file with comments | « components/pdf_viewer/pdf_viewer.cc ('k') | components/web_view/frame_apptest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698