| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this | 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this |
| 2 // source code is governed by a BSD-style license that can be found in the | 2 // source code is governed by a BSD-style license that can be found in the |
| 3 // LICENSE file. | 3 // LICENSE file. |
| 4 | 4 |
| 5 #include <math.h> | 5 #include <math.h> |
| 6 #include "config.h" | 6 #include "config.h" |
| 7 | 7 |
| 8 #include "FrameView.h" | 8 #include "FrameView.h" |
| 9 #include "ScrollView.h" | 9 #include "ScrollView.h" |
| 10 #include <wtf/Assertions.h> | 10 #include <wtf/Assertions.h> |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 #include "base/trace_event.h" | 21 #include "base/trace_event.h" |
| 22 #include "grit/webkit_resources.h" | 22 #include "grit/webkit_resources.h" |
| 23 #include "grit/webkit_strings.h" | 23 #include "grit/webkit_strings.h" |
| 24 #include "net/base/net_util.h" | 24 #include "net/base/net_util.h" |
| 25 #include "webkit/api/public/WebCursorInfo.h" | 25 #include "webkit/api/public/WebCursorInfo.h" |
| 26 #include "webkit/api/public/WebData.h" | 26 #include "webkit/api/public/WebData.h" |
| 27 #include "webkit/api/public/WebFrameClient.h" | 27 #include "webkit/api/public/WebFrameClient.h" |
| 28 #include "webkit/api/public/WebPluginListBuilder.h" | 28 #include "webkit/api/public/WebPluginListBuilder.h" |
| 29 #include "webkit/api/public/WebScreenInfo.h" | 29 #include "webkit/api/public/WebScreenInfo.h" |
| 30 #include "webkit/api/public/WebString.h" | 30 #include "webkit/api/public/WebString.h" |
| 31 #include "webkit/api/public/WebViewClient.h" |
| 31 #include "webkit/glue/chrome_client_impl.h" | 32 #include "webkit/glue/chrome_client_impl.h" |
| 32 #include "webkit/glue/glue_util.h" | 33 #include "webkit/glue/glue_util.h" |
| 33 #include "webkit/glue/plugins/plugin_instance.h" | 34 #include "webkit/glue/plugins/plugin_instance.h" |
| 34 #include "webkit/glue/webkit_glue.h" | 35 #include "webkit/glue/webkit_glue.h" |
| 35 #include "webkit/glue/webplugininfo.h" | 36 #include "webkit/glue/webplugininfo.h" |
| 36 #include "webkit/glue/weburlloader_impl.h" | 37 #include "webkit/glue/weburlloader_impl.h" |
| 37 #include "webkit/glue/webview_impl.h" | 38 #include "webkit/glue/webview_impl.h" |
| 38 #include "webkit/glue/webworkerclient_impl.h" | 39 #include "webkit/glue/webworkerclient_impl.h" |
| 39 | 40 |
| 40 using WebKit::WebApplicationCacheHost; | 41 using WebKit::WebApplicationCacheHost; |
| (...skipping 24 matching lines...) Expand all Loading... |
| 65 if (!page) | 66 if (!page) |
| 66 return NULL; | 67 return NULL; |
| 67 | 68 |
| 68 return static_cast<ChromeClientImpl*>(page->chrome()->client()); | 69 return static_cast<ChromeClientImpl*>(page->chrome()->client()); |
| 69 } | 70 } |
| 70 | 71 |
| 71 WebWidgetClient* ToWebWidgetClient(WebCore::Widget* widget) { | 72 WebWidgetClient* ToWebWidgetClient(WebCore::Widget* widget) { |
| 72 ChromeClientImpl* chrome_client = ToChromeClient(widget); | 73 ChromeClientImpl* chrome_client = ToChromeClient(widget); |
| 73 if (!chrome_client || !chrome_client->webview()) | 74 if (!chrome_client || !chrome_client->webview()) |
| 74 return NULL; | 75 return NULL; |
| 75 return chrome_client->webview()->delegate(); | 76 return chrome_client->webview()->client(); |
| 76 } | 77 } |
| 77 | 78 |
| 78 } | 79 } |
| 79 | 80 |
| 80 namespace webkit_glue { | 81 namespace webkit_glue { |
| 81 | 82 |
| 82 static int ToMessageID(WebLocalizedString::Name name) { | 83 static int ToMessageID(WebLocalizedString::Name name) { |
| 83 switch (name) { | 84 switch (name) { |
| 84 case WebLocalizedString::SubmitButtonDefaultLabel: | 85 case WebLocalizedString::SubmitButtonDefaultLabel: |
| 85 return IDS_FORM_SUBMIT_LABEL; | 86 return IDS_FORM_SUBMIT_LABEL; |
| (...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 506 return file_util::DirectoryExists(file_path); | 507 return file_util::DirectoryExists(file_path); |
| 507 } | 508 } |
| 508 | 509 |
| 509 WebKit::WebURL WebKitClientImpl::filePathToURL(const WebKit::WebString& path) { | 510 WebKit::WebURL WebKitClientImpl::filePathToURL(const WebKit::WebString& path) { |
| 510 FilePath file_path(webkit_glue::WebStringToFilePathString(path)); | 511 FilePath file_path(webkit_glue::WebStringToFilePathString(path)); |
| 511 GURL file_url = net::FilePathToFileURL(file_path); | 512 GURL file_url = net::FilePathToFileURL(file_path); |
| 512 return webkit_glue::KURLToWebURL(webkit_glue::GURLToKURL(file_url)); | 513 return webkit_glue::KURLToWebURL(webkit_glue::GURLToKURL(file_url)); |
| 513 } | 514 } |
| 514 | 515 |
| 515 } // namespace webkit_glue | 516 } // namespace webkit_glue |
| OLD | NEW |