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/ui/browser.h" | 15 #include "chrome/browser/ui/browser.h" |
16 #include "chrome/common/url_constants.h" | 16 #include "chrome/common/url_constants.h" |
17 #include "content/public/browser/web_contents.h" | 17 #include "content/public/browser/web_contents.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" | 20 #include "grit/generated_resources.h" |
21 | 21 |
22 | 22 |
23 bool InfobarsShowFunction::RunImpl() { | 23 bool InfobarsShowFunction::RunImpl() { |
24 DictionaryValue* args; | 24 base::DictionaryValue* args; |
25 EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(0, &args)); | 25 EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(0, &args)); |
26 | 26 |
27 const char kTabId[] = "tabId"; | 27 const char kTabId[] = "tabId"; |
28 int tab_id; | 28 int tab_id; |
29 EXTENSION_FUNCTION_VALIDATE(args->GetInteger(kTabId, &tab_id)); | 29 EXTENSION_FUNCTION_VALIDATE(args->GetInteger(kTabId, &tab_id)); |
30 | 30 |
31 const char kHtmlPath[] = "path"; | 31 const char kHtmlPath[] = "path"; |
32 std::string html_path; | 32 std::string html_path; |
33 EXTENSION_FUNCTION_VALIDATE(args->GetString(kHtmlPath, &html_path)); | 33 EXTENSION_FUNCTION_VALIDATE(args->GetString(kHtmlPath, &html_path)); |
34 | 34 |
(...skipping 16 matching lines...) Expand all Loading... |
51 GURL url(extension->GetResourceURL(extension->url(), html_path)); | 51 GURL url(extension->GetResourceURL(extension->url(), html_path)); |
52 ExtensionInfoBarDelegate::Create(web_contents, browser, GetExtension(), url, | 52 ExtensionInfoBarDelegate::Create(web_contents, browser, GetExtension(), url, |
53 height); | 53 height); |
54 | 54 |
55 // TODO(finnur): Return the actual DOMWindow object. Bug 26463. | 55 // TODO(finnur): Return the actual DOMWindow object. Bug 26463. |
56 DCHECK(browser->extension_window_controller()); | 56 DCHECK(browser->extension_window_controller()); |
57 SetResult(browser->extension_window_controller()->CreateWindowValue()); | 57 SetResult(browser->extension_window_controller()->CreateWindowValue()); |
58 | 58 |
59 return true; | 59 return true; |
60 } | 60 } |
OLD | NEW |