OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 "chrome/browser/tab_contents/interstitial_page.h" | 5 #include "chrome/browser/tab_contents/interstitial_page.h" |
6 | 6 |
7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
8 #include "base/message_loop.h" | 8 #include "base/message_loop.h" |
9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
10 #include "base/thread.h" | 10 #include "base/thread.h" |
11 #include "chrome/browser/browser_list.h" | 11 #include "chrome/browser/browser_list.h" |
12 #include "chrome/browser/browser_process.h" | 12 #include "chrome/browser/browser_process.h" |
13 #include "chrome/browser/chrome_thread.h" | 13 #include "chrome/browser/chrome_thread.h" |
14 #include "chrome/browser/dom_operation_notification_details.h" | 14 #include "chrome/browser/dom_operation_notification_details.h" |
15 #include "chrome/browser/profile.h" | 15 #include "chrome/browser/profile.h" |
16 #include "chrome/browser/renderer_host/render_process_host.h" | 16 #include "chrome/browser/renderer_host/render_process_host.h" |
17 #include "chrome/browser/renderer_host/render_widget_host_view.h" | 17 #include "chrome/browser/renderer_host/render_widget_host_view.h" |
18 #include "chrome/browser/renderer_host/resource_dispatcher_host.h" | 18 #include "chrome/browser/renderer_host/resource_dispatcher_host.h" |
19 #include "chrome/browser/renderer_host/site_instance.h" | 19 #include "chrome/browser/renderer_host/site_instance.h" |
20 #include "chrome/browser/renderer_preferences_util.h" | 20 #include "chrome/browser/renderer_preferences_util.h" |
21 #include "chrome/browser/tab_contents/navigation_controller.h" | 21 #include "chrome/browser/tab_contents/navigation_controller.h" |
22 #include "chrome/browser/tab_contents/navigation_entry.h" | 22 #include "chrome/browser/tab_contents/navigation_entry.h" |
23 #include "chrome/browser/tab_contents/tab_contents.h" | 23 #include "chrome/browser/tab_contents/tab_contents.h" |
24 #include "chrome/browser/tab_contents/tab_contents_view.h" | 24 #include "chrome/browser/tab_contents/tab_contents_view.h" |
25 #include "chrome/common/bindings_policy.h" | 25 #include "chrome/common/bindings_policy.h" |
| 26 #include "chrome/common/dom_storage_common.h" |
26 #if defined(TOOLKIT_GTK) | 27 #if defined(TOOLKIT_GTK) |
27 #include "chrome/browser/gtk/gtk_theme_provider.h" | 28 #include "chrome/browser/gtk/gtk_theme_provider.h" |
28 #endif | 29 #endif |
29 #include "chrome/common/notification_service.h" | 30 #include "chrome/common/notification_service.h" |
30 #include "grit/browser_resources.h" | 31 #include "grit/browser_resources.h" |
31 #include "net/base/escape.h" | 32 #include "net/base/escape.h" |
32 #include "views/window/window_delegate.h" | 33 #include "views/window/window_delegate.h" |
33 | 34 |
34 using WebKit::WebDragOperation; | 35 using WebKit::WebDragOperation; |
35 using WebKit::WebDragOperationsMask; | 36 using WebKit::WebDragOperationsMask; |
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
376 | 377 |
377 void InterstitialPage::DomOperationResponse(const std::string& json_string, | 378 void InterstitialPage::DomOperationResponse(const std::string& json_string, |
378 int automation_id) { | 379 int automation_id) { |
379 if (enabled_) | 380 if (enabled_) |
380 CommandReceived(json_string); | 381 CommandReceived(json_string); |
381 } | 382 } |
382 | 383 |
383 RenderViewHost* InterstitialPage::CreateRenderViewHost() { | 384 RenderViewHost* InterstitialPage::CreateRenderViewHost() { |
384 RenderViewHost* render_view_host = new RenderViewHost( | 385 RenderViewHost* render_view_host = new RenderViewHost( |
385 SiteInstance::CreateSiteInstance(tab()->profile()), | 386 SiteInstance::CreateSiteInstance(tab()->profile()), |
386 this, MSG_ROUTING_NONE); | 387 this, MSG_ROUTING_NONE, kInvalidSessionStorageNamespaceId); |
387 return render_view_host; | 388 return render_view_host; |
388 } | 389 } |
389 | 390 |
390 TabContentsView* InterstitialPage::CreateTabContentsView() { | 391 TabContentsView* InterstitialPage::CreateTabContentsView() { |
391 TabContentsView* tab_contents_view = tab()->view(); | 392 TabContentsView* tab_contents_view = tab()->view(); |
392 RenderWidgetHostView* view = | 393 RenderWidgetHostView* view = |
393 tab_contents_view->CreateViewForWidget(render_view_host_); | 394 tab_contents_view->CreateViewForWidget(render_view_host_); |
394 render_view_host_->set_view(view); | 395 render_view_host_->set_view(view); |
395 render_view_host_->AllowBindings(BindingsPolicy::DOM_AUTOMATION); | 396 render_view_host_->AllowBindings(BindingsPolicy::DOM_AUTOMATION); |
396 | 397 |
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
612 } | 613 } |
613 | 614 |
614 void InterstitialPage::InterstitialPageRVHViewDelegate::OnFindReply( | 615 void InterstitialPage::InterstitialPageRVHViewDelegate::OnFindReply( |
615 int request_id, int number_of_matches, const gfx::Rect& selection_rect, | 616 int request_id, int number_of_matches, const gfx::Rect& selection_rect, |
616 int active_match_ordinal, bool final_update) { | 617 int active_match_ordinal, bool final_update) { |
617 } | 618 } |
618 | 619 |
619 int InterstitialPage::GetBrowserWindowID() const { | 620 int InterstitialPage::GetBrowserWindowID() const { |
620 return tab_->GetBrowserWindowID(); | 621 return tab_->GetBrowserWindowID(); |
621 } | 622 } |
OLD | NEW |