Mandoline webview: View => Window

components/html_viewer/html_frame_tree_manager.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/html_viewer/html_frame_tree_manager.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 62 matching lines @@
     scoped_ptr<DocumentResourceWaiter> resource_waiter,
     HTMLFrameDelegate* delegate) {
   if (!instances_)
     instances_ = new TreeMap;
 
   mojo::InterfaceRequest<web_view::mojom::FrameClient> frame_client_request;
   web_view::mojom::FramePtr server_frame;
   mojo::Array<web_view::mojom::FrameDataPtr> frame_data;
   uint32_t change_id;
   uint32_t window_id;
-  web_view::mojom::ViewConnectType view_connect_type;
+  web_view::mojom::WindowConnectType window_connect_type;
   web_view::mojom::FrameClient::OnConnectCallback on_connect_callback;
   resource_waiter->Release(&frame_client_request, &server_frame, &frame_data,
-                           &change_id, &window_id, &view_connect_type,
+                           &change_id, &window_id, &window_connect_type,
                            &on_connect_callback);
   resource_waiter.reset();
 
   on_connect_callback.Run();
 
   HTMLFrameTreeManager* frame_tree =
       FindFrameTreeWithRoot(frame_data[0]->frame_id);
 
   DCHECK(!frame_tree || change_id <= frame_tree->change_id_);
 
   DVLOG(2) << "HTMLFrameTreeManager::CreateFrameAndAttachToTree "
            << " frame_tree=" << frame_tree << " use_existing="
-           << (view_connect_type ==
-               web_view::mojom::VIEW_CONNECT_TYPE_USE_EXISTING)
+           << (window_connect_type ==
+               web_view::mojom::WINDOW_CONNECT_TYPE_USE_EXISTING)
            << " frame_id=" << window_id;
-  if (view_connect_type == web_view::mojom::VIEW_CONNECT_TYPE_USE_EXISTING &&
+  if (window_connect_type ==
+          web_view::mojom::WINDOW_CONNECT_TYPE_USE_EXISTING &&
       !frame_tree) {
     DVLOG(1) << "was told to use existing window but do not have frame tree";
     return nullptr;
   }
 
   if (!frame_tree) {
     frame_tree = new HTMLFrameTreeManager(global_state);
     frame_tree->Init(delegate, window, frame_data, change_id);
     (*instances_)[frame_data[0]->frame_id] = frame_tree;
-  } else if (view_connect_type ==
-             web_view::mojom::VIEW_CONNECT_TYPE_USE_EXISTING) {
+  } else if (window_connect_type ==
+             web_view::mojom::WINDOW_CONNECT_TYPE_USE_EXISTING) {
     HTMLFrame* existing_frame = frame_tree->root_->FindFrame(window_id);
     if (!existing_frame) {
       DVLOG(1) << "was told to use existing window but could not find window";
       return nullptr;
     }
     if (!existing_frame->IsLocal()) {
       DVLOG(1) << "was told to use existing window, but frame is remote";
       return nullptr;
     }
     existing_frame->SwapDelegate(delegate);
@@ skipping 275 matching lines @@
 
       for (const auto& child : node->children())
         nodes.push(child);
     }
   }
 
   return new_local_frame;
 }
 
 }  // namespace mojo