| 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_infobar_delegate.h" | 11 #include "chrome/browser/extensions/extension_infobar_delegate.h" |
| 12 #include "chrome/browser/extensions/extension_tab_util.h" | 12 #include "chrome/browser/extensions/extension_tab_util.h" |
| 13 #include "chrome/browser/extensions/window_controller.h" | 13 #include "chrome/browser/extensions/window_controller.h" |
| 14 #include "chrome/browser/ui/browser.h" | 14 #include "chrome/browser/ui/browser.h" |
| 15 #include "chrome/common/url_constants.h" | 15 #include "chrome/common/url_constants.h" |
| 16 #include "content/public/browser/web_contents.h" | 16 #include "content/public/browser/web_contents.h" |
| 17 #include "extensions/browser/extension_host.h" | 17 #include "extensions/browser/extension_host.h" |
| 18 #include "extensions/common/error_utils.h" | 18 #include "extensions/common/error_utils.h" |
| 19 #include "extensions/common/extension.h" | 19 #include "extensions/common/extension.h" |
| 20 #include "grit/generated_resources.h" | |
| 21 | 20 |
| 22 bool InfobarsShowFunction::RunSync() { | 21 bool InfobarsShowFunction::RunSync() { |
| 23 base::DictionaryValue* args; | 22 base::DictionaryValue* args; |
| 24 EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(0, &args)); | 23 EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(0, &args)); |
| 25 | 24 |
| 26 const char kTabId[] = "tabId"; | 25 const char kTabId[] = "tabId"; |
| 27 int tab_id; | 26 int tab_id; |
| 28 EXTENSION_FUNCTION_VALIDATE(args->GetInteger(kTabId, &tab_id)); | 27 EXTENSION_FUNCTION_VALIDATE(args->GetInteger(kTabId, &tab_id)); |
| 29 | 28 |
| 30 const char kHtmlPath[] = "path"; | 29 const char kHtmlPath[] = "path"; |
| (...skipping 18 matching lines...) Expand all Loading... |
| 49 GURL url(extension()->GetResourceURL(extension()->url(), html_path)); | 48 GURL url(extension()->GetResourceURL(extension()->url(), html_path)); |
| 50 ExtensionInfoBarDelegate::Create( | 49 ExtensionInfoBarDelegate::Create( |
| 51 web_contents, browser, extension(), url, height); | 50 web_contents, browser, extension(), url, height); |
| 52 | 51 |
| 53 // TODO(finnur): Return the actual DOMWindow object. Bug 26463. | 52 // TODO(finnur): Return the actual DOMWindow object. Bug 26463. |
| 54 DCHECK(browser->extension_window_controller()); | 53 DCHECK(browser->extension_window_controller()); |
| 55 SetResult(browser->extension_window_controller()->CreateWindowValue()); | 54 SetResult(browser->extension_window_controller()->CreateWindowValue()); |
| 56 | 55 |
| 57 return true; | 56 return true; |
| 58 } | 57 } |
| OLD | NEW |