| 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/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
| 9 #include "chrome/browser/chrome_notification_types.h" | 9 #include "chrome/browser/chrome_notification_types.h" |
| 10 #include "chrome/browser/devtools/devtools_window.h" | 10 #include "chrome/browser/devtools/devtools_window.h" |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 #include "content/public/browser/render_view_host.h" | 24 #include "content/public/browser/render_view_host.h" |
| 25 #include "content/public/browser/web_contents.h" | 25 #include "content/public/browser/web_contents.h" |
| 26 #include "content/public/browser/web_contents_view.h" | 26 #include "content/public/browser/web_contents_view.h" |
| 27 #include "ui/gfx/insets.h" | 27 #include "ui/gfx/insets.h" |
| 28 #include "ui/views/layout/fill_layout.h" | 28 #include "ui/views/layout/fill_layout.h" |
| 29 #include "ui/views/widget/widget.h" | 29 #include "ui/views/widget/widget.h" |
| 30 | 30 |
| 31 #if defined(USE_AURA) | 31 #if defined(USE_AURA) |
| 32 #include "ui/aura/client/activation_client.h" | 32 #include "ui/aura/client/activation_client.h" |
| 33 #include "ui/aura/window.h" | 33 #include "ui/aura/window.h" |
| 34 #include "ui/views/corewm/window_animations.h" | 34 #include "ui/wm/core/window_animations.h" |
| 35 #include "ui/views/corewm/window_util.h" | 35 #include "ui/wm/core/window_util.h" |
| 36 #endif | 36 #endif |
| 37 | 37 |
| 38 #if defined(OS_WIN) | 38 #if defined(OS_WIN) |
| 39 #include "ui/views/win/hwnd_util.h" | 39 #include "ui/views/win/hwnd_util.h" |
| 40 #endif | 40 #endif |
| 41 | 41 |
| 42 using content::BrowserContext; | 42 using content::BrowserContext; |
| 43 using content::RenderViewHost; | 43 using content::RenderViewHost; |
| 44 using content::WebContents; | 44 using content::WebContents; |
| 45 | 45 |
| (...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 251 GetWidget()->Show(); | 251 GetWidget()->Show(); |
| 252 | 252 |
| 253 // Focus on the host contents when the bubble is first shown. | 253 // Focus on the host contents when the bubble is first shown. |
| 254 host()->host_contents()->GetView()->Focus(); | 254 host()->host_contents()->GetView()->Focus(); |
| 255 | 255 |
| 256 if (inspect_with_devtools_) { | 256 if (inspect_with_devtools_) { |
| 257 DevToolsWindow::OpenDevToolsWindow(host()->render_view_host(), | 257 DevToolsWindow::OpenDevToolsWindow(host()->render_view_host(), |
| 258 DevToolsToggleAction::ShowConsole()); | 258 DevToolsToggleAction::ShowConsole()); |
| 259 } | 259 } |
| 260 } | 260 } |
| OLD | NEW |