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

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

Issue 1565343003: Move mojo/application/public -> mojo/shell/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fetcher
Patch Set: . 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 unified diff | Download patch
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 <stddef.h> 7 #include <stddef.h>
8 #include <algorithm> 8 #include <algorithm>
9 #include <limits> 9 #include <limits>
10 #include <utility> 10 #include <utility>
(...skipping 21 matching lines...) Expand all
32 #include "components/html_viewer/media_factory.h" 32 #include "components/html_viewer/media_factory.h"
33 #include "components/html_viewer/stats_collection_controller.h" 33 #include "components/html_viewer/stats_collection_controller.h"
34 #include "components/html_viewer/touch_handler.h" 34 #include "components/html_viewer/touch_handler.h"
35 #include "components/html_viewer/web_layer_tree_view_impl.h" 35 #include "components/html_viewer/web_layer_tree_view_impl.h"
36 #include "components/html_viewer/web_storage_namespace_impl.h" 36 #include "components/html_viewer/web_storage_namespace_impl.h"
37 #include "components/html_viewer/web_url_loader_impl.h" 37 #include "components/html_viewer/web_url_loader_impl.h"
38 #include "components/mus/public/cpp/scoped_window_ptr.h" 38 #include "components/mus/public/cpp/scoped_window_ptr.h"
39 #include "components/mus/public/cpp/window.h" 39 #include "components/mus/public/cpp/window.h"
40 #include "components/mus/public/cpp/window_tree_connection.h" 40 #include "components/mus/public/cpp/window_tree_connection.h"
41 #include "components/mus/ws/ids.h" 41 #include "components/mus/ws/ids.h"
42 #include "mojo/application/public/cpp/application_impl.h"
43 #include "mojo/application/public/cpp/connect.h"
44 #include "mojo/application/public/interfaces/shell.mojom.h"
45 #include "mojo/common/common_type_converters.h" 42 #include "mojo/common/common_type_converters.h"
46 #include "mojo/converters/blink/blink_input_events_type_converters.h" 43 #include "mojo/converters/blink/blink_input_events_type_converters.h"
47 #include "mojo/converters/geometry/geometry_type_converters.h" 44 #include "mojo/converters/geometry/geometry_type_converters.h"
45 #include "mojo/shell/public/cpp/application_impl.h"
46 #include "mojo/shell/public/cpp/connect.h"
47 #include "mojo/shell/public/interfaces/shell.mojom.h"
48 #include "third_party/WebKit/public/platform/Platform.h" 48 #include "third_party/WebKit/public/platform/Platform.h"
49 #include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h" 49 #include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h"
50 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h" 50 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
51 #include "third_party/WebKit/public/platform/WebSize.h" 51 #include "third_party/WebKit/public/platform/WebSize.h"
52 #include "third_party/WebKit/public/web/WebConsoleMessage.h" 52 #include "third_party/WebKit/public/web/WebConsoleMessage.h"
53 #include "third_party/WebKit/public/web/WebDocument.h" 53 #include "third_party/WebKit/public/web/WebDocument.h"
54 #include "third_party/WebKit/public/web/WebElement.h" 54 #include "third_party/WebKit/public/web/WebElement.h"
55 #include "third_party/WebKit/public/web/WebFindOptions.h" 55 #include "third_party/WebKit/public/web/WebFindOptions.h"
56 #include "third_party/WebKit/public/web/WebFrameOwnerProperties.h" 56 #include "third_party/WebKit/public/web/WebFrameOwnerProperties.h"
57 #include "third_party/WebKit/public/web/WebInputEvent.h" 57 #include "third_party/WebKit/public/web/WebInputEvent.h"
(...skipping 981 matching lines...) Expand 10 before | Expand all | Expand 10 after
1039 1039
1040 if (!surface_layer_) 1040 if (!surface_layer_)
1041 return; 1041 return;
1042 1042
1043 surface_layer_->SetSurfaceId(cc::SurfaceId(owned_window_->window()->id()), 1043 surface_layer_->SetSurfaceId(cc::SurfaceId(owned_window_->window()->id()),
1044 global_state()->device_pixel_ratio(), 1044 global_state()->device_pixel_ratio(),
1045 owned_window_->window()->bounds().size()); 1045 owned_window_->window()->bounds().size());
1046 } 1046 }
1047 1047
1048 } // namespace mojo 1048 } // namespace mojo
OLDNEW
« no previous file with comments | « components/html_viewer/html_document_application_delegate.cc ('k') | components/html_viewer/html_frame_apptest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698