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

Side by Side Diff: components/html_viewer/html_frame.cc

Issue 1377493002: mus: move View Manager to components/mus/vm (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 5 years, 2 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 unified diff | Download patch
« no previous file with comments | « components/html_viewer/html_document.cc ('k') | components/mus/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/html_viewer/html_frame.h" 5 #include "components/html_viewer/html_frame.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 15 matching lines...) Expand all
26 #include "components/html_viewer/html_frame_delegate.h" 26 #include "components/html_viewer/html_frame_delegate.h"
27 #include "components/html_viewer/html_frame_properties.h" 27 #include "components/html_viewer/html_frame_properties.h"
28 #include "components/html_viewer/html_frame_tree_manager.h" 28 #include "components/html_viewer/html_frame_tree_manager.h"
29 #include "components/html_viewer/html_widget.h" 29 #include "components/html_viewer/html_widget.h"
30 #include "components/html_viewer/media_factory.h" 30 #include "components/html_viewer/media_factory.h"
31 #include "components/html_viewer/stats_collection_controller.h" 31 #include "components/html_viewer/stats_collection_controller.h"
32 #include "components/html_viewer/touch_handler.h" 32 #include "components/html_viewer/touch_handler.h"
33 #include "components/html_viewer/web_layer_tree_view_impl.h" 33 #include "components/html_viewer/web_layer_tree_view_impl.h"
34 #include "components/html_viewer/web_storage_namespace_impl.h" 34 #include "components/html_viewer/web_storage_namespace_impl.h"
35 #include "components/html_viewer/web_url_loader_impl.h" 35 #include "components/html_viewer/web_url_loader_impl.h"
36 #include "components/mus/ids.h"
37 #include "components/mus/public/cpp/scoped_view_ptr.h" 36 #include "components/mus/public/cpp/scoped_view_ptr.h"
38 #include "components/mus/public/cpp/view.h" 37 #include "components/mus/public/cpp/view.h"
39 #include "components/mus/public/cpp/view_tree_connection.h" 38 #include "components/mus/public/cpp/view_tree_connection.h"
39 #include "components/mus/vm/ids.h"
40 #include "mojo/application/public/cpp/application_impl.h" 40 #include "mojo/application/public/cpp/application_impl.h"
41 #include "mojo/application/public/cpp/connect.h" 41 #include "mojo/application/public/cpp/connect.h"
42 #include "mojo/application/public/interfaces/shell.mojom.h" 42 #include "mojo/application/public/interfaces/shell.mojom.h"
43 #include "mojo/common/common_type_converters.h" 43 #include "mojo/common/common_type_converters.h"
44 #include "mojo/converters/geometry/geometry_type_converters.h" 44 #include "mojo/converters/geometry/geometry_type_converters.h"
45 #include "skia/ext/refptr.h" 45 #include "skia/ext/refptr.h"
46 #include "third_party/WebKit/public/platform/Platform.h" 46 #include "third_party/WebKit/public/platform/Platform.h"
47 #include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h" 47 #include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h"
48 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h" 48 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
49 #include "third_party/WebKit/public/platform/WebSize.h" 49 #include "third_party/WebKit/public/platform/WebSize.h"
(...skipping 868 matching lines...) Expand 10 before | Expand all | Expand 10 after
918 if (!surface_layer_) 918 if (!surface_layer_)
919 return; 919 return;
920 920
921 surface_layer_->SetSurfaceId( 921 surface_layer_->SetSurfaceId(
922 cc::SurfaceId(owned_view_->view()->id()), 922 cc::SurfaceId(owned_view_->view()->id()),
923 global_state()->device_pixel_ratio(), 923 global_state()->device_pixel_ratio(),
924 owned_view_->view()->bounds().To<gfx::Rect>().size()); 924 owned_view_->view()->bounds().To<gfx::Rect>().size());
925 } 925 }
926 926
927 } // namespace mojo 927 } // namespace mojo
OLDNEW
« no previous file with comments | « components/html_viewer/html_document.cc ('k') | components/mus/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698