Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / content / shell / browser / shell_login_dialog.h

diff --git a/src/content/shell/browser/shell_login_dialog.h b/src/content/shell/browser/shell_login_dialog.h
index d9b0504..76ad054 100644 (file)
--- a/src/content/shell/browser/shell_login_dialog.h
+++ b/src/content/shell/browser/shell_login_dialog.h
@@ -9,10 +9,6 @@
 #include "base/strings/string16.h"
 #include "content/public/browser/resource_dispatcher_host_login_delegate.h"
 
-#if defined(TOOLKIT_GTK)
-#include "ui/base/gtk/gtk_signal.h"
-#endif
-
 #if defined(OS_MACOSX)
 #if __OBJC__
 @class ShellLoginDialogHelper;
@@ -43,7 +39,8 @@ class ShellLoginDialog : public ResourceDispatcherHostLoginDelegate {
   // the aforementioned platform specific code may not have access to private
   // members. Not to be called from client code.
   // Threading: UI thread.
-  void UserAcceptedAuth(const string16& username, const string16& password);
+  void UserAcceptedAuth(const base::string16& username,
+                        const base::string16& password);
   void UserCancelledAuth();
 
  protected:
@@ -55,7 +52,7 @@ class ShellLoginDialog : public ResourceDispatcherHostLoginDelegate {
   // platform specific LoginDialog implementation.
   // Creates the dialog.
   // Threading: UI thread.
-  void PlatformCreateDialog(const string16& message);
+  void PlatformCreateDialog(const base::string16& message);
   // Called from the destructor to let each platform do any necessary cleanup.
   // Threading: UI thread.
   void PlatformCleanUp();
@@ -65,13 +62,13 @@ class ShellLoginDialog : public ResourceDispatcherHostLoginDelegate {
 
   // Sets up dialog creation.
   // Threading: UI thread.
-  void PrepDialog(const string16& host, const string16& realm);
+  void PrepDialog(const base::string16& host, const base::string16& realm);
 
   // Sends the authentication to the requester.
   // Threading: IO thread.
   void SendAuthToRequester(bool success,
-                           const string16& username,
-                           const string16& password);
+                           const base::string16& username,
+                           const base::string16& password);
 
   // Who/where/what asked for the authentication.
   // Threading: IO thread.
@@ -84,11 +81,6 @@ class ShellLoginDialog : public ResourceDispatcherHostLoginDelegate {
 #if defined(OS_MACOSX)
   // Threading: UI thread.
   ShellLoginDialogHelper* helper_;  // owned
-#elif defined(TOOLKIT_GTK)
-  GtkWidget* username_entry_;
-  GtkWidget* password_entry_;
-  GtkWidget* root_;
-  CHROMEGTK_CALLBACK_1(ShellLoginDialog, void, OnResponse, int);
 #endif
 };