| 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/infobars/infobar_extension_api.h" | 5 #include "chrome/browser/infobars/infobar_extension_api.h" |
| 6 | 6 |
| 7 #include "base/strings/string_number_conversions.h" | 7 #include "base/strings/string_number_conversions.h" |
| 8 #include "base/strings/string_util.h" | 8 #include "base/strings/string_util.h" |
| 9 #include "base/values.h" | 9 #include "base/values.h" |
| 10 #include "chrome/browser/extensions/api/tabs/tabs_constants.h" | 10 #include "chrome/browser/extensions/api/tabs/tabs_constants.h" |
| 11 #include "chrome/browser/extensions/extension_host.h" | 11 #include "chrome/browser/extensions/extension_host.h" |
| 12 #include "chrome/browser/extensions/extension_infobar_delegate.h" | 12 #include "chrome/browser/extensions/extension_infobar_delegate.h" |
| 13 #include "chrome/browser/extensions/extension_tab_util.h" | 13 #include "chrome/browser/extensions/extension_tab_util.h" |
| 14 #include "chrome/browser/extensions/window_controller.h" | 14 #include "chrome/browser/extensions/window_controller.h" |
| 15 #include "chrome/browser/infobars/confirm_infobar_delegate.h" | 15 #include "chrome/browser/infobars/confirm_infobar_delegate.h" |
| 16 #include "chrome/browser/infobars/infobar_service.h" | 16 #include "chrome/browser/infobars/infobar_service.h" |
| 17 #include "chrome/browser/ui/browser.h" | 17 #include "chrome/browser/ui/browser.h" |
| 18 #include "chrome/common/extensions/extension.h" | |
| 19 #include "chrome/common/url_constants.h" | 18 #include "chrome/common/url_constants.h" |
| 20 #include "content/public/browser/web_contents.h" | 19 #include "content/public/browser/web_contents.h" |
| 21 #include "extensions/common/error_utils.h" | 20 #include "extensions/common/error_utils.h" |
| 21 #include "extensions/common/extension.h" |
| 22 #include "grit/generated_resources.h" | 22 #include "grit/generated_resources.h" |
| 23 | 23 |
| 24 using extensions::Extension; | 24 using extensions::Extension; |
| 25 | 25 |
| 26 namespace { | 26 namespace { |
| 27 | 27 |
| 28 const char kHtmlPath[] = "path"; | 28 const char kHtmlPath[] = "path"; |
| 29 const char kTabId[] = "tabId"; | 29 const char kTabId[] = "tabId"; |
| 30 const char kHeight[] = "height"; | 30 const char kHeight[] = "height"; |
| 31 | 31 |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 ExtensionInfoBarDelegate::Create( | 66 ExtensionInfoBarDelegate::Create( |
| 67 InfoBarService::FromWebContents(web_contents), browser, GetExtension(), | 67 InfoBarService::FromWebContents(web_contents), browser, GetExtension(), |
| 68 url, height); | 68 url, height); |
| 69 | 69 |
| 70 // TODO(finnur): Return the actual DOMWindow object. Bug 26463. | 70 // TODO(finnur): Return the actual DOMWindow object. Bug 26463. |
| 71 DCHECK(browser->extension_window_controller()); | 71 DCHECK(browser->extension_window_controller()); |
| 72 SetResult(browser->extension_window_controller()->CreateWindowValue()); | 72 SetResult(browser->extension_window_controller()->CreateWindowValue()); |
| 73 | 73 |
| 74 return true; | 74 return true; |
| 75 } | 75 } |
| OLD | NEW |