OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/ui/views/tab_contents/chrome_web_contents_view_delegate
_views.h" | 5 #include "chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate
_views.h" |
6 | 6 |
7 #include "chrome/browser/browser_shutdown.h" | 7 #include "chrome/browser/browser_shutdown.h" |
8 #include "chrome/browser/ui/sad_tab_helper.h" | 8 #include "chrome/browser/ui/sad_tab_helper.h" |
9 #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h" | 9 #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h" |
10 #include "chrome/browser/ui/views/sad_tab_view.h" | 10 #include "chrome/browser/ui/views/sad_tab_view.h" |
11 #include "chrome/browser/ui/views/tab_contents/render_view_context_menu_views.h" | 11 #include "chrome/browser/ui/views/tab_contents/render_view_context_menu_views.h" |
12 #include "chrome/browser/ui/web_contents_modal_dialog_manager.h" | |
13 #include "chrome/common/chrome_switches.h" | 12 #include "chrome/common/chrome_switches.h" |
| 13 #include "components/web_modal/web_contents_modal_dialog_manager.h" |
14 #include "content/public/browser/render_process_host.h" | 14 #include "content/public/browser/render_process_host.h" |
15 #include "content/public/browser/render_view_host.h" | 15 #include "content/public/browser/render_view_host.h" |
16 #include "content/public/browser/render_widget_host_view.h" | 16 #include "content/public/browser/render_widget_host_view.h" |
17 #include "content/public/browser/web_contents.h" | 17 #include "content/public/browser/web_contents.h" |
18 #include "content/public/browser/web_contents_delegate.h" | 18 #include "content/public/browser/web_contents_delegate.h" |
19 #include "content/public/browser/web_contents_view.h" | 19 #include "content/public/browser/web_contents_view.h" |
20 #include "ui/views/focus/focus_manager.h" | 20 #include "ui/views/focus/focus_manager.h" |
21 #include "ui/views/focus/view_storage.h" | 21 #include "ui/views/focus/view_storage.h" |
22 #include "ui/views/widget/widget.h" | 22 #include "ui/views/widget/widget.h" |
23 | 23 |
24 #if defined(USE_AURA) | 24 #if defined(USE_AURA) |
25 #include "chrome/browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.h" | 25 #include "chrome/browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.h" |
26 #include "ui/aura/client/screen_position_client.h" | 26 #include "ui/aura/client/screen_position_client.h" |
27 #include "ui/aura/root_window.h" | 27 #include "ui/aura/root_window.h" |
28 #include "ui/aura/window.h" | 28 #include "ui/aura/window.h" |
29 #else | 29 #else |
30 #include "chrome/browser/ui/views/tab_contents/web_drag_bookmark_handler_win.h" | 30 #include "chrome/browser/ui/views/tab_contents/web_drag_bookmark_handler_win.h" |
31 #endif | 31 #endif |
32 | 32 |
| 33 using web_modal::WebContentsModalDialogManager; |
| 34 |
33 ChromeWebContentsViewDelegateViews::ChromeWebContentsViewDelegateViews( | 35 ChromeWebContentsViewDelegateViews::ChromeWebContentsViewDelegateViews( |
34 content::WebContents* web_contents) | 36 content::WebContents* web_contents) |
35 : web_contents_(web_contents) { | 37 : web_contents_(web_contents) { |
36 last_focused_view_storage_id_ = | 38 last_focused_view_storage_id_ = |
37 views::ViewStorage::GetInstance()->CreateStorageID(); | 39 views::ViewStorage::GetInstance()->CreateStorageID(); |
38 } | 40 } |
39 | 41 |
40 ChromeWebContentsViewDelegateViews::~ChromeWebContentsViewDelegateViews() { | 42 ChromeWebContentsViewDelegateViews::~ChromeWebContentsViewDelegateViews() { |
41 // Makes sure to remove any stored view we may still have in the ViewStorage. | 43 // Makes sure to remove any stored view we may still have in the ViewStorage. |
42 // | 44 // |
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
200 } | 202 } |
201 | 203 |
202 namespace chrome { | 204 namespace chrome { |
203 | 205 |
204 content::WebContentsViewDelegate* CreateWebContentsViewDelegate( | 206 content::WebContentsViewDelegate* CreateWebContentsViewDelegate( |
205 content::WebContents* web_contents) { | 207 content::WebContents* web_contents) { |
206 return new ChromeWebContentsViewDelegateViews(web_contents); | 208 return new ChromeWebContentsViewDelegateViews(web_contents); |
207 } | 209 } |
208 | 210 |
209 } // namespace chrome | 211 } // namespace chrome |
OLD | NEW |