Merge WebWidgetClient into WebViewClient.

sky/engine/web/ChromeClientImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 42 matching lines @@
 #include "sky/engine/public/platform/WebCursorInfo.h"
 #include "sky/engine/public/platform/WebInputEvent.h"
 #include "sky/engine/public/platform/WebRect.h"
 #include "sky/engine/public/platform/WebURLRequest.h"
 #include "sky/engine/public/web/Sky.h"
 #include "sky/engine/public/web/WebConsoleMessage.h"
 #include "sky/engine/public/web/WebFrameClient.h"
 #include "sky/engine/public/web/WebNode.h"
 #include "sky/engine/public/web/WebSettings.h"
 #include "sky/engine/public/web/WebTextDirection.h"
-#include "sky/engine/public/web/WebTouchAction.h"
 #include "sky/engine/public/web/WebViewClient.h"
 #include "sky/engine/web/WebLocalFrameImpl.h"
 #include "sky/engine/web/WebSettingsImpl.h"
 #include "sky/engine/web/WebViewImpl.h"
 #include "sky/engine/wtf/text/CString.h"
 #include "sky/engine/wtf/text/StringBuilder.h"
 #include "sky/engine/wtf/text/StringConcatenate.h"
 #include "sky/engine/wtf/unicode/CharacterNames.h"
 
 namespace blink {
@@ skipping 41 matching lines @@
 FloatRect ChromeClientImpl::pageRect()
 {
     // We hide the details of the window's border thickness from the web page by
     // simple re-using the window position here.  So, from the point-of-view of
     // the web page, the window has no border.
     return windowRect();
 }
 
 void ChromeClientImpl::focus()
 {
-    if (m_webView->client())
-        m_webView->client()->didFocus();
 }
 
 bool ChromeClientImpl::canTakeFocus(FocusType)
 {
     // For now the browser can always take focus if we're not running layout
     // tests.
     return !layoutTestMode();
 }
 
 void ChromeClientImpl::takeFocus(FocusType type)
@@ skipping 23 matching lines @@
         webframe->client()->frameFocused();
 }
 
 WebNavigationPolicy ChromeClientImpl::getNavigationPolicy()
 {
     return WebNavigationPolicyCurrentTab;
 }
 
 void ChromeClientImpl::show(NavigationPolicy navigationPolicy)
 {
-    if (!m_webView->client())
-        return;
-
-    WebNavigationPolicy policy = static_cast<WebNavigationPolicy>(navigationPolicy);
-    if (policy == WebNavigationPolicyIgnore)
-        policy = getNavigationPolicy();
-    m_webView->client()->show(policy);
 }
 
 bool ChromeClientImpl::shouldReportDetailedMessageForSource(const String& url)
 {
     WebLocalFrameImpl* webframe = m_webView->mainFrameImpl();
     return webframe->client() && webframe->client()->shouldReportDetailedMessageForSource(url);
 }
 
 inline static String messageLevelAsString(MessageLevel level)
 {
@@ skipping 59 matching lines @@
     m_webView->layoutUpdated(WebLocalFrameImpl::fromFrame(frame));
 }
 
 void ChromeClientImpl::setCursor(const Cursor& cursor)
 {
     setCursor(WebCursorInfo(cursor));
 }
 
 void ChromeClientImpl::setCursor(const WebCursorInfo& cursor)
 {
-    if (m_webView->client())
-        m_webView->client()->didChangeCursor(cursor);
 }
 
 String ChromeClientImpl::acceptLanguages()
 {
     return m_webView->client()->acceptLanguages();
 }
 
-void ChromeClientImpl::setTouchAction(TouchAction touchAction)
-{
-    if (WebViewClient* client = m_webView->client()) {
-        WebTouchAction webTouchAction = static_cast<WebTouchAction>(touchAction);
-        client->setTouchAction(webTouchAction);
-    }
-}
-
 void ChromeClientImpl::willSetInputMethodState()
 {
-    if (m_webView->client())
-        m_webView->client()->resetInputMethod();
-}
-
-void ChromeClientImpl::didUpdateTextOfFocusedElementByNonUserInput()
-{
-    if (m_webView->client())
-        m_webView->client()->didUpdateTextOfFocusedElementByNonUserInput();
-}
-
-void ChromeClientImpl::showImeIfNeeded()
-{
-    if (m_webView->client())
-        m_webView->client()->showImeIfNeeded();
 }
 
 } // namespace blink