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

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 2009073003: Move mojo/converters/geometry -> ui/gfx/geometry/mojo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 6 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/browser/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <cmath> 9 #include <cmath>
10 #include <utility> 10 #include <utility>
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 #include "content/public/common/child_process_host.h" 108 #include "content/public/common/child_process_host.h"
109 #include "content/public/common/content_constants.h" 109 #include "content/public/common/content_constants.h"
110 #include "content/public/common/content_switches.h" 110 #include "content/public/common/content_switches.h"
111 #include "content/public/common/page_zoom.h" 111 #include "content/public/common/page_zoom.h"
112 #include "content/public/common/result_codes.h" 112 #include "content/public/common/result_codes.h"
113 #include "content/public/common/security_style.h" 113 #include "content/public/common/security_style.h"
114 #include "content/public/common/url_constants.h" 114 #include "content/public/common/url_constants.h"
115 #include "content/public/common/url_utils.h" 115 #include "content/public/common/url_utils.h"
116 #include "content/public/common/web_preferences.h" 116 #include "content/public/common/web_preferences.h"
117 #include "mojo/common/url_type_converters.h" 117 #include "mojo/common/url_type_converters.h"
118 #include "mojo/converters/geometry/geometry_type_converters.h"
119 #include "net/base/url_util.h" 118 #include "net/base/url_util.h"
120 #include "net/http/http_cache.h" 119 #include "net/http/http_cache.h"
121 #include "net/http/http_transaction_factory.h" 120 #include "net/http/http_transaction_factory.h"
122 #include "net/url_request/url_request_context.h" 121 #include "net/url_request/url_request_context.h"
123 #include "net/url_request/url_request_context_getter.h" 122 #include "net/url_request/url_request_context_getter.h"
124 #include "skia/public/type_converters.h" 123 #include "skia/public/type_converters.h"
125 #include "third_party/WebKit/public/web/WebSandboxFlags.h" 124 #include "third_party/WebKit/public/web/WebSandboxFlags.h"
126 #include "third_party/skia/include/core/SkBitmap.h" 125 #include "third_party/skia/include/core/SkBitmap.h"
127 #include "ui/accessibility/ax_tree_combiner.h" 126 #include "ui/accessibility/ax_tree_combiner.h"
128 #include "ui/base/layout.h" 127 #include "ui/base/layout.h"
128 #include "ui/gfx/geometry/mojo/geometry_type_converters.h"
129 #include "ui/gl/gl_switches.h" 129 #include "ui/gl/gl_switches.h"
130 130
131 #if defined(OS_ANDROID) 131 #if defined(OS_ANDROID)
132 #include "content/browser/android/content_video_view.h" 132 #include "content/browser/android/content_video_view.h"
133 #include "content/browser/android/date_time_chooser_android.h" 133 #include "content/browser/android/date_time_chooser_android.h"
134 #include "content/browser/media/android/media_web_contents_observer_android.h" 134 #include "content/browser/media/android/media_web_contents_observer_android.h"
135 #include "content/browser/web_contents/web_contents_android.h" 135 #include "content/browser/web_contents/web_contents_android.h"
136 #endif // OS_ANDROID 136 #endif // OS_ANDROID
137 137
138 #if defined(OS_MACOSX) 138 #if defined(OS_MACOSX)
(...skipping 4920 matching lines...) Expand 10 before | Expand all | Expand 10 after
5059 for (RenderViewHost* render_view_host : render_view_host_set) 5059 for (RenderViewHost* render_view_host : render_view_host_set)
5060 render_view_host->OnWebkitPreferencesChanged(); 5060 render_view_host->OnWebkitPreferencesChanged();
5061 } 5061 }
5062 5062
5063 void WebContentsImpl::SetJavaScriptDialogManagerForTesting( 5063 void WebContentsImpl::SetJavaScriptDialogManagerForTesting(
5064 JavaScriptDialogManager* dialog_manager) { 5064 JavaScriptDialogManager* dialog_manager) {
5065 dialog_manager_ = dialog_manager; 5065 dialog_manager_ = dialog_manager;
5066 } 5066 }
5067 5067
5068 } // namespace content 5068 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/BUILD.gn ('k') | content/common/BUILD.gn » ('j') | ui/gfx/gfx.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698