| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/extensions/extension_action_runner.h" | 5 #include "chrome/browser/extensions/extension_action_runner.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| 11 #include "base/bind_helpers.h" | 11 #include "base/bind_helpers.h" |
| 12 #include "base/location.h" |
| 12 #include "base/memory/ptr_util.h" | 13 #include "base/memory/ptr_util.h" |
| 13 #include "base/metrics/histogram.h" | 14 #include "base/metrics/histogram.h" |
| 15 #include "base/single_thread_task_runner.h" |
| 14 #include "base/stl_util.h" | 16 #include "base/stl_util.h" |
| 17 #include "base/threading/thread_task_runner_handle.h" |
| 15 #include "chrome/browser/extensions/active_tab_permission_granter.h" | 18 #include "chrome/browser/extensions/active_tab_permission_granter.h" |
| 16 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h" | 19 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h" |
| 17 #include "chrome/browser/extensions/extension_action.h" | 20 #include "chrome/browser/extensions/extension_action.h" |
| 18 #include "chrome/browser/extensions/extension_action_manager.h" | 21 #include "chrome/browser/extensions/extension_action_manager.h" |
| 19 #include "chrome/browser/extensions/permissions_updater.h" | 22 #include "chrome/browser/extensions/permissions_updater.h" |
| 20 #include "chrome/browser/extensions/tab_helper.h" | 23 #include "chrome/browser/extensions/tab_helper.h" |
| 21 #include "chrome/browser/profiles/profile.h" | 24 #include "chrome/browser/profiles/profile.h" |
| 22 #include "chrome/browser/sessions/session_tab_helper.h" | 25 #include "chrome/browser/sessions/session_tab_helper.h" |
| 23 #include "chrome/browser/ui/browser_finder.h" | 26 #include "chrome/browser/ui/browser_finder.h" |
| 24 #include "chrome/browser/ui/browser_window.h" | 27 #include "chrome/browser/ui/browser_window.h" |
| (...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 343 void ExtensionActionRunner::ShowBlockedActionBubble( | 346 void ExtensionActionRunner::ShowBlockedActionBubble( |
| 344 const Extension* extension) { | 347 const Extension* extension) { |
| 345 Browser* browser = chrome::FindBrowserWithWebContents(web_contents()); | 348 Browser* browser = chrome::FindBrowserWithWebContents(web_contents()); |
| 346 ToolbarActionsBar* toolbar_actions_bar = | 349 ToolbarActionsBar* toolbar_actions_bar = |
| 347 browser ? browser->window()->GetToolbarActionsBar() : nullptr; | 350 browser ? browser->window()->GetToolbarActionsBar() : nullptr; |
| 348 if (toolbar_actions_bar) { | 351 if (toolbar_actions_bar) { |
| 349 auto callback = | 352 auto callback = |
| 350 base::Bind(&ExtensionActionRunner::OnBlockedActionBubbleClosed, | 353 base::Bind(&ExtensionActionRunner::OnBlockedActionBubbleClosed, |
| 351 weak_factory_.GetWeakPtr(), extension->id()); | 354 weak_factory_.GetWeakPtr(), extension->id()); |
| 352 if (default_bubble_close_action_for_testing_) { | 355 if (default_bubble_close_action_for_testing_) { |
| 353 base::MessageLoop::current()->PostTask( | 356 base::ThreadTaskRunnerHandle::Get()->PostTask( |
| 354 FROM_HERE, | 357 FROM_HERE, |
| 355 base::Bind(callback, *default_bubble_close_action_for_testing_)); | 358 base::Bind(callback, *default_bubble_close_action_for_testing_)); |
| 356 } else { | 359 } else { |
| 357 toolbar_actions_bar->ShowToolbarActionBubble(base::WrapUnique( | 360 toolbar_actions_bar->ShowToolbarActionBubble(base::WrapUnique( |
| 358 new BlockedActionBubbleDelegate(callback, extension->id()))); | 361 new BlockedActionBubbleDelegate(callback, extension->id()))); |
| 359 } | 362 } |
| 360 } | 363 } |
| 361 } | 364 } |
| 362 | 365 |
| 363 void ExtensionActionRunner::OnBlockedActionBubbleClosed( | 366 void ExtensionActionRunner::OnBlockedActionBubbleClosed( |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 416 UnloadedExtensionInfo::Reason reason) { | 419 UnloadedExtensionInfo::Reason reason) { |
| 417 PendingScriptMap::iterator iter = pending_scripts_.find(extension->id()); | 420 PendingScriptMap::iterator iter = pending_scripts_.find(extension->id()); |
| 418 if (iter != pending_scripts_.end()) { | 421 if (iter != pending_scripts_.end()) { |
| 419 pending_scripts_.erase(iter); | 422 pending_scripts_.erase(iter); |
| 420 ExtensionActionAPI::Get(browser_context_) | 423 ExtensionActionAPI::Get(browser_context_) |
| 421 ->NotifyPageActionsChanged(web_contents()); | 424 ->NotifyPageActionsChanged(web_contents()); |
| 422 } | 425 } |
| 423 } | 426 } |
| 424 | 427 |
| 425 } // namespace extensions | 428 } // namespace extensions |
| OLD | NEW |