| 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/extensions/extension_popup.h" | 5 #include "chrome/browser/ui/views/extensions/extension_popup.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/message_loop.h" | 8 #include "base/message_loop.h" |
| 9 #include "chrome/browser/debugger/devtools_window.h" | 9 #include "chrome/browser/debugger/devtools_window.h" |
| 10 #include "chrome/browser/extensions/extension_process_manager.h" | 10 #include "chrome/browser/extensions/extension_process_manager.h" |
| 11 #include "chrome/browser/platform_util.h" | 11 #include "chrome/browser/platform_util.h" |
| 12 #include "chrome/browser/profiles/profile.h" | 12 #include "chrome/browser/profiles/profile.h" |
| 13 #include "chrome/browser/ui/browser.h" | 13 #include "chrome/browser/ui/browser.h" |
| 14 #include "chrome/browser/ui/browser_window.h" | 14 #include "chrome/browser/ui/browser_window.h" |
| 15 #include "chrome/browser/ui/views/window.h" | 15 #include "chrome/browser/ui/views/window.h" |
| 16 #include "chrome/common/chrome_notification_types.h" | 16 #include "chrome/common/chrome_notification_types.h" |
| 17 #include "content/public/browser/notification_details.h" | 17 #include "content/public/browser/notification_details.h" |
| 18 #include "content/public/browser/notification_source.h" | 18 #include "content/public/browser/notification_source.h" |
| 19 #include "content/public/browser/render_view_host.h" | 19 #include "content/public/browser/render_view_host.h" |
| 20 #include "content/public/browser/web_contents.h" | 20 #include "content/public/browser/web_contents.h" |
| 21 #include "ui/views/layout/fill_layout.h" | 21 #include "ui/views/layout/fill_layout.h" |
| 22 | 22 |
| 23 #if defined(USE_AURA) | 23 #if defined(USE_AURA) |
| 24 #include "ui/aura/window.h" | 24 #include "ui/aura/window.h" |
| 25 #endif | 25 #endif |
| 26 | 26 |
| 27 using content::RenderViewHost; |
| 27 using content::WebContents; | 28 using content::WebContents; |
| 28 | 29 |
| 29 namespace { | 30 namespace { |
| 30 | 31 |
| 31 // Returns true if |possible_parent| is a parent window of |child|. | 32 // Returns true if |possible_parent| is a parent window of |child|. |
| 32 bool IsParent(gfx::NativeView child, gfx::NativeView possible_parent) { | 33 bool IsParent(gfx::NativeView child, gfx::NativeView possible_parent) { |
| 33 if (!child) | 34 if (!child) |
| 34 return false; | 35 return false; |
| 35 #if !defined(USE_AURA) && defined(OS_WIN) | 36 #if !defined(USE_AURA) && defined(OS_WIN) |
| 36 if (::GetWindow(child, GW_OWNER) == possible_parent) | 37 if (::GetWindow(child, GW_OWNER) == possible_parent) |
| (...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 199 | 200 |
| 200 if (inspect_with_devtools_) { | 201 if (inspect_with_devtools_) { |
| 201 DevToolsWindow::ToggleDevToolsWindow(host()->render_view_host(), | 202 DevToolsWindow::ToggleDevToolsWindow(host()->render_view_host(), |
| 202 DEVTOOLS_TOGGLE_ACTION_SHOW_CONSOLE); | 203 DEVTOOLS_TOGGLE_ACTION_SHOW_CONSOLE); |
| 203 } | 204 } |
| 204 } | 205 } |
| 205 | 206 |
| 206 void ExtensionPopup::CloseBubble() { | 207 void ExtensionPopup::CloseBubble() { |
| 207 GetWidget()->Close(); | 208 GetWidget()->Close(); |
| 208 } | 209 } |
| OLD | NEW |