Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / ash / chrome_shell_delegate_views.cc

diff --git a/src/chrome/browser/ui/ash/chrome_shell_delegate_views.cc b/src/chrome/browser/ui/ash/chrome_shell_delegate_views.cc
index db4feb3..6c14832 100644 (file)
--- a/src/chrome/browser/ui/ash/chrome_shell_delegate_views.cc
+++ b/src/chrome/browser/ui/ash/chrome_shell_delegate_views.cc
@@ -123,6 +123,13 @@ class EmptyAccessibilityDelegate : public ash::AccessibilityDelegate {
   virtual void SilenceSpokenFeedback() const OVERRIDE {
   }
 
+  virtual void SetVirtualKeyboardEnabled(bool enabled) OVERRIDE {
+  }
+
+  virtual bool IsVirtualKeyboardEnabled() const OVERRIDE {
+    return false;
+  }
+
   virtual void TriggerAccessibilityAlert(
       ash::AccessibilityAlert alert) OVERRIDE {
   }
@@ -192,12 +199,14 @@ void ChromeShellDelegate::Observe(int type,
                                   const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_ASH_SESSION_STARTED: {
+#if defined(OS_WIN)
       // If we are launched to service a windows 8 search request then let the
       // IPC which carries the search string create the browser and initiate
       // the navigation.
       if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kWindows8Search))
         break;
+#endif
       // If Chrome ASH is launched when no browser is open in the desktop,
       // we should execute the startup code.
       // If there are browsers open in the desktop, we create a browser window