| 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_dialog.h" | 5 #include "chrome/browser/ui/views/extensions/extension_dialog.h" |
| 6 | 6 |
| 7 #include "chrome/browser/extensions/extension_host.h" | 7 #include "chrome/browser/extensions/extension_host.h" |
| 8 #include "chrome/browser/extensions/extension_process_manager.h" | 8 #include "chrome/browser/extensions/extension_process_manager.h" |
| 9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
| 10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 namespace { | 27 namespace { |
| 28 | 28 |
| 29 views::Widget* CreateWindow(gfx::NativeWindow parent, | 29 views::Widget* CreateWindow(gfx::NativeWindow parent, |
| 30 views::WidgetDelegate* delegate) { | 30 views::WidgetDelegate* delegate) { |
| 31 #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK) | 31 #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK) |
| 32 // TODO(msw): revert to BubbleWindow for all ChromeOS cases when CL | 32 // TODO(msw): revert to BubbleWindow for all ChromeOS cases when CL |
| 33 // for crbug.com/98322 is landed. | 33 // for crbug.com/98322 is landed. |
| 34 // On Chrome OS we need to override the style to suppress padding around | 34 // On Chrome OS we need to override the style to suppress padding around |
| 35 // the borders. | 35 // the borders. |
| 36 return chromeos::BubbleWindow::Create(parent, | 36 return chromeos::BubbleWindow::Create(parent, |
| 37 chromeos::STYLE_FLUSH, delegate); | 37 STYLE_FLUSH, delegate); |
| 38 #else | 38 #else |
| 39 return browser::CreateViewsWindow(parent, delegate); | 39 return browser::CreateViewsWindow(parent, delegate); |
| 40 #endif | 40 #endif |
| 41 } | 41 } |
| 42 | 42 |
| 43 } // namespace | 43 } // namespace |
| 44 | 44 |
| 45 ExtensionDialog::ExtensionDialog(ExtensionHost* host, | 45 ExtensionDialog::ExtensionDialog(ExtensionHost* host, |
| 46 ExtensionDialogObserver* observer) | 46 ExtensionDialogObserver* observer) |
| 47 : window_(NULL), | 47 : window_(NULL), |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 167 // If we aren't the host of the popup, then disregard the notification. | 167 // If we aren't the host of the popup, then disregard the notification. |
| 168 if (content::Details<ExtensionHost>(host()) != details) | 168 if (content::Details<ExtensionHost>(host()) != details) |
| 169 return; | 169 return; |
| 170 Close(); | 170 Close(); |
| 171 break; | 171 break; |
| 172 default: | 172 default: |
| 173 NOTREACHED() << L"Received unexpected notification"; | 173 NOTREACHED() << L"Received unexpected notification"; |
| 174 break; | 174 break; |
| 175 } | 175 } |
| 176 } | 176 } |
| OLD | NEW |