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 <stddef.h> | 5 #include <stddef.h> |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/callback.h" | 8 #include "base/callback.h" |
9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/memory/ptr_util.h" |
10 #include "base/strings/stringprintf.h" | 11 #include "base/strings/stringprintf.h" |
11 #include "base/strings/utf_string_conversions.h" | 12 #include "base/strings/utf_string_conversions.h" |
12 #include "build/build_config.h" | 13 #include "build/build_config.h" |
13 #include "chrome/browser/extensions/api/permissions/permissions_api.h" | 14 #include "chrome/browser/extensions/api/permissions/permissions_api.h" |
14 #include "chrome/browser/extensions/extension_apitest.h" | 15 #include "chrome/browser/extensions/extension_apitest.h" |
15 #include "chrome/browser/extensions/extension_service.h" | 16 #include "chrome/browser/extensions/extension_service.h" |
16 #include "chrome/browser/extensions/test_extension_dir.h" | 17 #include "chrome/browser/extensions/test_extension_dir.h" |
17 #include "chrome/browser/ui/browser.h" | 18 #include "chrome/browser/ui/browser.h" |
18 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 19 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
19 #include "chrome/common/chrome_switches.h" | 20 #include "chrome/common/chrome_switches.h" |
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
161 web_contents_(web_contents), | 162 web_contents_(web_contents), |
162 dialog_manager_(nullptr), | 163 dialog_manager_(nullptr), |
163 client_(nullptr) { | 164 client_(nullptr) { |
164 app_modal::JavaScriptDialogManager* dialog_manager_impl = | 165 app_modal::JavaScriptDialogManager* dialog_manager_impl = |
165 app_modal::JavaScriptDialogManager::GetInstance(); | 166 app_modal::JavaScriptDialogManager::GetInstance(); |
166 dialog_manager_ = | 167 dialog_manager_ = |
167 web_contents_->GetDelegate()->GetJavaScriptDialogManager(web_contents_); | 168 web_contents_->GetDelegate()->GetJavaScriptDialogManager(web_contents_); |
168 DCHECK_EQ(dialog_manager_impl, dialog_manager_); | 169 DCHECK_EQ(dialog_manager_impl, dialog_manager_); |
169 | 170 |
170 client_ = new DialogClient(this); | 171 client_ = new DialogClient(this); |
171 dialog_manager_impl->SetExtensionsClient(make_scoped_ptr(client_)); | 172 dialog_manager_impl->SetExtensionsClient(base::WrapUnique(client_)); |
172 } | 173 } |
173 | 174 |
174 DialogHelper::~DialogHelper() { | 175 DialogHelper::~DialogHelper() { |
175 client_->set_helper(nullptr); | 176 client_->set_helper(nullptr); |
176 } | 177 } |
177 | 178 |
178 void DialogHelper::CloseDialogs() { | 179 void DialogHelper::CloseDialogs() { |
179 dialog_manager_->CancelActiveAndPendingDialogs(web_contents_); | 180 dialog_manager_->CancelActiveAndPendingDialogs(web_contents_); |
180 } | 181 } |
181 | 182 |
(...skipping 449 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
631 ExtensionTestMessageListener iframe_loaded_listener("iframe loaded", false); | 632 ExtensionTestMessageListener iframe_loaded_listener("iframe loaded", false); |
632 ExtensionTestMessageListener content_script_listener("script injected", | 633 ExtensionTestMessageListener content_script_listener("script injected", |
633 false); | 634 false); |
634 LoadExtension(data_dir.AppendASCII("script_a_com")); | 635 LoadExtension(data_dir.AppendASCII("script_a_com")); |
635 LoadExtension(data_dir.AppendASCII("background_page_iframe")); | 636 LoadExtension(data_dir.AppendASCII("background_page_iframe")); |
636 iframe_loaded_listener.WaitUntilSatisfied(); | 637 iframe_loaded_listener.WaitUntilSatisfied(); |
637 EXPECT_FALSE(content_script_listener.was_satisfied()); | 638 EXPECT_FALSE(content_script_listener.was_satisfied()); |
638 } | 639 } |
639 | 640 |
640 } // namespace extensions | 641 } // namespace extensions |
OLD | NEW |