OLD | NEW |
1 | 1 |
2 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 2 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
3 // Use of this source code is governed by a BSD-style license that can be | 3 // Use of this source code is governed by a BSD-style license that can be |
4 // found in the LICENSE file. | 4 // found in the LICENSE file. |
5 | 5 |
6 #include "content/browser/browser_url_handler.h" | 6 #include "content/browser/browser_url_handler.h" |
7 #include "content/browser/renderer_host/test_backing_store.h" | 7 #include "content/browser/renderer_host/test_backing_store.h" |
8 #include "content/browser/renderer_host/test_render_view_host.h" | 8 #include "content/browser/renderer_host/test_render_view_host.h" |
9 #include "content/browser/site_instance.h" | 9 #include "content/browser/site_instance.h" |
10 #include "content/browser/tab_contents/navigation_controller.h" | 10 #include "content/browser/tab_contents/navigation_controller.h" |
11 #include "content/browser/tab_contents/test_tab_contents.h" | 11 #include "content/browser/tab_contents/test_tab_contents.h" |
12 #include "content/common/dom_storage_common.h" | 12 #include "content/common/dom_storage_common.h" |
13 #include "content/common/view_messages.h" | 13 #include "content/common/view_messages.h" |
14 #include "content/public/common/content_client.h" | 14 #include "content/public/common/content_client.h" |
15 #include "content/test/test_browser_context.h" | 15 #include "content/test/test_browser_context.h" |
16 #include "ui/gfx/rect.h" | 16 #include "ui/gfx/rect.h" |
| 17 #include "webkit/forms/password_form.h" |
17 #include "webkit/glue/webkit_glue.h" | 18 #include "webkit/glue/webkit_glue.h" |
18 #include "webkit/glue/webpreferences.h" | 19 #include "webkit/glue/webpreferences.h" |
19 #include "webkit/glue/password_form.h" | |
20 | 20 |
21 using webkit_glue::PasswordForm; | 21 using webkit::forms::PasswordForm; |
22 | 22 |
23 void InitNavigateParams(ViewHostMsg_FrameNavigate_Params* params, | 23 void InitNavigateParams(ViewHostMsg_FrameNavigate_Params* params, |
24 int page_id, | 24 int page_id, |
25 const GURL& url, | 25 const GURL& url, |
26 content::PageTransition transition) { | 26 content::PageTransition transition) { |
27 params->page_id = page_id; | 27 params->page_id = page_id; |
28 params->url = url; | 28 params->url = url; |
29 params->referrer = content::Referrer(); | 29 params->referrer = content::Referrer(); |
30 params->transition = transition; | 30 params->transition = transition; |
31 params->redirects = std::vector<GURL>(); | 31 params->redirects = std::vector<GURL>(); |
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
377 SetContents(NULL); | 377 SetContents(NULL); |
378 | 378 |
379 // Make sure that we flush any messages related to TabContents destruction | 379 // Make sure that we flush any messages related to TabContents destruction |
380 // before we destroy the browser context. | 380 // before we destroy the browser context. |
381 MessageLoop::current()->RunAllPending(); | 381 MessageLoop::current()->RunAllPending(); |
382 | 382 |
383 // Release the browser context on the UI thread. | 383 // Release the browser context on the UI thread. |
384 message_loop_.DeleteSoon(FROM_HERE, browser_context_.release()); | 384 message_loop_.DeleteSoon(FROM_HERE, browser_context_.release()); |
385 message_loop_.RunAllPending(); | 385 message_loop_.RunAllPending(); |
386 } | 386 } |
OLD | NEW |