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

Side by Side Diff: sky/engine/web/ChromeClientImpl.cpp

Issue 922893002: Merge the Sky Engine changes from the SkyDart branch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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 | « sky/engine/web/BUILD.gn ('k') | sky/engine/web/FrameLoaderClientImpl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 16 matching lines...) Expand all
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32 #include "sky/engine/config.h" 32 #include "sky/engine/config.h"
33 #include "sky/engine/web/ChromeClientImpl.h" 33 #include "sky/engine/web/ChromeClientImpl.h"
34 34
35 #include "base/logging.h" 35 #include "base/logging.h"
36 #include "gen/sky/platform/RuntimeEnabledFeatures.h" 36 #include "gen/sky/platform/RuntimeEnabledFeatures.h"
37 #include "sky/engine/bindings/core/v8/ScriptController.h"
38 #include "sky/engine/core/dom/Document.h" 37 #include "sky/engine/core/dom/Document.h"
39 #include "sky/engine/core/dom/Element.h" 38 #include "sky/engine/core/dom/Element.h"
40 #include "sky/engine/core/dom/Node.h" 39 #include "sky/engine/core/dom/Node.h"
41 #include "sky/engine/core/events/KeyboardEvent.h" 40 #include "sky/engine/core/events/KeyboardEvent.h"
42 #include "sky/engine/core/frame/Console.h"
43 #include "sky/engine/core/frame/FrameView.h" 41 #include "sky/engine/core/frame/FrameView.h"
44 #include "sky/engine/core/frame/Settings.h" 42 #include "sky/engine/core/frame/Settings.h"
45 #include "sky/engine/core/page/Page.h" 43 #include "sky/engine/core/page/Page.h"
46 #include "sky/engine/core/rendering/HitTestResult.h" 44 #include "sky/engine/core/rendering/HitTestResult.h"
47 #include "sky/engine/platform/Cursor.h" 45 #include "sky/engine/platform/Cursor.h"
48 #include "sky/engine/platform/NotImplemented.h" 46 #include "sky/engine/platform/NotImplemented.h"
49 #include "sky/engine/platform/PlatformScreen.h" 47 #include "sky/engine/platform/PlatformScreen.h"
50 #include "sky/engine/platform/exported/WrappedResourceRequest.h" 48 #include "sky/engine/platform/exported/WrappedResourceRequest.h"
51 #include "sky/engine/platform/geometry/FloatRect.h" 49 #include "sky/engine/platform/geometry/FloatRect.h"
52 #include "sky/engine/platform/geometry/IntRect.h" 50 #include "sky/engine/platform/geometry/IntRect.h"
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 void ChromeClientImpl::setCursor(const WebCursorInfo& cursor) 227 void ChromeClientImpl::setCursor(const WebCursorInfo& cursor)
230 { 228 {
231 } 229 }
232 230
233 String ChromeClientImpl::acceptLanguages() 231 String ChromeClientImpl::acceptLanguages()
234 { 232 {
235 return m_webView->client()->acceptLanguages(); 233 return m_webView->client()->acceptLanguages();
236 } 234 }
237 235
238 } // namespace blink 236 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/web/BUILD.gn ('k') | sky/engine/web/FrameLoaderClientImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698