OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/extensions/extension_popup.h" | 5 #include "chrome/browser/ui/views/extensions/extension_popup.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "chrome/browser/debugger/devtools_window.h" | 10 #include "chrome/browser/debugger/devtools_window.h" |
11 #include "chrome/browser/extensions/extension_host.h" | 11 #include "chrome/browser/extensions/extension_host.h" |
12 #include "chrome/browser/extensions/extension_process_manager.h" | 12 #include "chrome/browser/extensions/extension_process_manager.h" |
13 #include "chrome/browser/profiles/profile.h" | 13 #include "chrome/browser/profiles/profile.h" |
14 #include "chrome/browser/ui/browser.h" | 14 #include "chrome/browser/ui/browser.h" |
15 #include "chrome/browser/ui/browser_window.h" | 15 #include "chrome/browser/ui/browser_window.h" |
16 #include "chrome/common/chrome_notification_types.h" | 16 #include "chrome/common/chrome_notification_types.h" |
17 #include "chrome/common/extensions/extension.h" | 17 #include "chrome/common/extensions/extension.h" |
18 #include "content/browser/renderer_host/render_view_host.h" | 18 #include "content/browser/renderer_host/render_view_host.h" |
19 #include "content/browser/renderer_host/render_widget_host_view.h" | 19 #include "content/browser/renderer_host/render_widget_host_view.h" |
| 20 #include "content/browser/tab_contents/tab_contents.h" |
20 #include "content/public/browser/notification_details.h" | 21 #include "content/public/browser/notification_details.h" |
21 #include "content/public/browser/notification_source.h" | 22 #include "content/public/browser/notification_source.h" |
22 #include "views/widget/root_view.h" | 23 #include "views/widget/root_view.h" |
23 #include "views/widget/widget.h" | 24 #include "views/widget/widget.h" |
24 | 25 |
25 #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK) | 26 #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK) |
26 #include "chrome/browser/chromeos/wm_ipc.h" | 27 #include "chrome/browser/chromeos/wm_ipc.h" |
27 #include "third_party/cros_system_api/window_manager/chromeos_wm_ipc_enums.h" | 28 #include "third_party/cros_system_api/window_manager/chromeos_wm_ipc_enums.h" |
28 #endif | 29 #endif |
29 | 30 |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
88 ResizeToView(); | 89 ResizeToView(); |
89 } | 90 } |
90 | 91 |
91 void ExtensionPopup::BubbleBrowserWindowClosing(BrowserBubble* bubble) { | 92 void ExtensionPopup::BubbleBrowserWindowClosing(BrowserBubble* bubble) { |
92 if (!closing_) | 93 if (!closing_) |
93 Close(); | 94 Close(); |
94 } | 95 } |
95 | 96 |
96 void ExtensionPopup::BubbleGotFocus(BrowserBubble* bubble) { | 97 void ExtensionPopup::BubbleGotFocus(BrowserBubble* bubble) { |
97 // Forward the focus to the renderer. | 98 // Forward the focus to the renderer. |
98 host()->render_view_host()->view()->Focus(); | 99 host()->host_contents()->Focus(); |
99 } | 100 } |
100 | 101 |
101 void ExtensionPopup::BubbleLostFocus(BrowserBubble* bubble, | 102 void ExtensionPopup::BubbleLostFocus(BrowserBubble* bubble, |
102 bool lost_focus_to_child) { | 103 bool lost_focus_to_child) { |
103 if (closing_ || // We are already closing. | 104 if (closing_ || // We are already closing. |
104 inspect_with_devtools_ || // The popup is being inspected. | 105 inspect_with_devtools_ || // The popup is being inspected. |
105 !close_on_lost_focus_ || // Our client is handling focus listening. | 106 !close_on_lost_focus_ || // Our client is handling focus listening. |
106 lost_focus_to_child) // A child of this view got focus. | 107 lost_focus_to_child) // A child of this view got focus. |
107 return; | 108 return; |
108 | 109 |
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
205 if (closing_) | 206 if (closing_) |
206 return; | 207 return; |
207 closing_ = true; | 208 closing_ = true; |
208 DetachFromBrowser(); | 209 DetachFromBrowser(); |
209 | 210 |
210 if (observer_) | 211 if (observer_) |
211 observer_->ExtensionPopupIsClosing(this); | 212 observer_->ExtensionPopupIsClosing(this); |
212 | 213 |
213 Release(); // Balanced in ctor. | 214 Release(); // Balanced in ctor. |
214 } | 215 } |
OLD | NEW |