| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/shell/browser/shell_login_dialog.h" | 5 #include "content/shell/browser/shell_login_dialog.h" |
| 6 | 6 |
| 7 #include <gtk/gtk.h> | 7 #include <gtk/gtk.h> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/strings/string16.h" | 10 #include "base/strings/string16.h" |
| 11 #include "base/strings/utf_string_conversions.h" | 11 #include "base/strings/utf_string_conversions.h" |
| 12 #include "content/public/browser/browser_thread.h" | 12 #include "content/public/browser/browser_thread.h" |
| 13 #include "content/public/browser/render_view_host.h" | 13 #include "content/public/browser/render_view_host.h" |
| 14 #include "content/public/browser/resource_dispatcher_host.h" | 14 #include "content/public/browser/resource_dispatcher_host.h" |
| 15 #include "content/public/browser/resource_request_info.h" | 15 #include "content/public/browser/resource_request_info.h" |
| 16 #include "content/public/browser/web_contents.h" | 16 #include "content/public/browser/web_contents.h" |
| 17 #include "content/public/browser/web_contents_view.h" | 17 #include "content/public/browser/web_contents_view.h" |
| 18 #include "ui/base/gtk/gtk_hig_constants.h" | 18 #include "ui/base/gtk/gtk_hig_constants.h" |
| 19 | 19 |
| 20 namespace content { | 20 namespace content { |
| 21 | 21 |
| 22 void ShellLoginDialog::PlatformCreateDialog(const string16& message) { | 22 void ShellLoginDialog::PlatformCreateDialog(const base::string16& message) { |
| 23 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 23 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 24 | 24 |
| 25 int render_process_id; | 25 int render_process_id; |
| 26 int render_view_id; | 26 int render_view_id; |
| 27 if (!ResourceRequestInfo::ForRequest(request_)->GetAssociatedRenderView( | 27 if (!ResourceRequestInfo::ForRequest(request_)->GetAssociatedRenderView( |
| 28 &render_process_id, &render_view_id)) { | 28 &render_process_id, &render_view_id)) { |
| 29 NOTREACHED(); | 29 NOTREACHED(); |
| 30 } | 30 } |
| 31 | 31 |
| 32 WebContents* web_contents = NULL; | 32 WebContents* web_contents = NULL; |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 UserCancelledAuth(); | 102 UserCancelledAuth(); |
| 103 break; | 103 break; |
| 104 default: | 104 default: |
| 105 NOTREACHED(); | 105 NOTREACHED(); |
| 106 } | 106 } |
| 107 | 107 |
| 108 gtk_widget_destroy(root_); | 108 gtk_widget_destroy(root_); |
| 109 } | 109 } |
| 110 | 110 |
| 111 } // namespace content | 111 } // namespace content |
| OLD | NEW |