views/mus: Set-up transient windows correctly.

components/web_view/frame.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/web_view/frame.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/stl_util.h"
 #include "base/trace_event/trace_event.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_property.h"
 #include "components/web_view/frame_tree.h"
 #include "components/web_view/frame_tree_delegate.h"
 #include "components/web_view/frame_user_data.h"
 #include "components/web_view/frame_utils.h"
 #include "mojo/application/public/interfaces/shell.mojom.h"
 #include "mojo/common/url_type_converters.h"
 #include "url/gurl.h"
 
 using mus::Window;
 
-DECLARE_WINDOW_PROPERTY_TYPE(web_view::Frame*);
+MUS_DECLARE_WINDOW_PROPERTY_TYPE(web_view::Frame*);
 
 namespace web_view {
 
 // Used to find the Frame associated with a Window.
-DEFINE_LOCAL_WINDOW_PROPERTY_KEY(Frame*, kFrame, nullptr);
+MUS_DEFINE_LOCAL_WINDOW_PROPERTY_KEY(Frame*, kFrame, nullptr);
 
 namespace {
 
 const uint32_t kNoParentId = 0u;
 const mus::ConnectionSpecificId kInvalidConnectionId = 0u;
 
 mojom::FrameDataPtr FrameToFrameData(const Frame* frame) {
   mojom::FrameDataPtr frame_data(mojom::FrameData::New());
   frame_data->frame_id = frame->id();
   frame_data->parent_id = frame->parent() ? frame->parent()->id() : kNoParentId;
@@ skipping 555 matching lines @@
                                               final_update);
 }
 
 void Frame::OnFindInPageSelectionUpdated(int32_t request_id,
                                          int32_t active_match_ordinal) {
   tree_->delegate_->OnFindInPageSelectionUpdated(request_id, this,
                                                  active_match_ordinal);
 }
 
 }  // namespace web_view