Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / ash / system / tray / default_system_tray_delegate.cc

diff --git a/src/ash/system/tray/default_system_tray_delegate.cc b/src/ash/system/tray/default_system_tray_delegate.cc
index 46c4c3d..1ac2c04 100644 (file)
--- a/src/ash/system/tray/default_system_tray_delegate.cc
+++ b/src/ash/system/tray/default_system_tray_delegate.cc
@@ -6,7 +6,7 @@
 
 #include <string>
 
-#include "ash/session_state_delegate.h"
+#include "ash/session/session_state_delegate.h"
 #include "ash/shell.h"
 #include "ash/volume_control_delegate.h"
 #include "base/message_loop/message_loop.h"
@@ -59,10 +59,6 @@ user::LoginStatus DefaultSystemTrayDelegate::GetUserLoginStatus() const {
   return user::LOGGED_IN_USER;
 }
 
-bool DefaultSystemTrayDelegate::IsOobeCompleted() const {
-  return true;
-}
-
 void DefaultSystemTrayDelegate::ChangeProfilePicture() {
 }
 
@@ -108,6 +104,9 @@ bool DefaultSystemTrayDelegate::ShouldShowSettings() {
 void DefaultSystemTrayDelegate::ShowDateSettings() {
 }
 
+void DefaultSystemTrayDelegate::ShowSetTimeDialog() {
+}
+
 void DefaultSystemTrayDelegate::ShowNetworkSettings(
     const std::string& service_path) {
 }
@@ -253,6 +252,10 @@ bool DefaultSystemTrayDelegate::GetBluetoothEnabled() {
   return bluetooth_enabled_;
 }
 
+bool DefaultSystemTrayDelegate::GetBluetoothDiscovering() {
+  return false;
+}
+
 void DefaultSystemTrayDelegate::ChangeProxySettings() {
 }
 
@@ -293,4 +296,9 @@ bool DefaultSystemTrayDelegate::IsSearchKeyMappedToCapsLock() {
   return false;
 }
 
+tray::UserAccountsDelegate* DefaultSystemTrayDelegate::GetUserAccountsDelegate(
+    const std::string& user_id) {
+  return NULL;
+}
+
 }  // namespace ash