| 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/ui/hung_plugin_tab_helper.h" | 5 #include "chrome/browser/ui/hung_plugin_tab_helper.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
| 11 #include "base/macros.h" | 11 #include "base/macros.h" |
| 12 #include "base/process/process.h" | 12 #include "base/process/process.h" |
| 13 #include "base/rand_util.h" | 13 #include "base/rand_util.h" |
| 14 #include "build/build_config.h" | 14 #include "build/build_config.h" |
| 15 #include "chrome/app/vector_icons/vector_icons.h" | 15 #include "chrome/app/vector_icons/vector_icons.h" |
| 16 #include "chrome/browser/chrome_notification_types.h" | 16 #include "chrome/browser/chrome_notification_types.h" |
| 17 #include "chrome/browser/infobars/infobar_service.h" | 17 #include "chrome/browser/infobars/infobar_service.h" |
| 18 #include "chrome/common/channel_info.h" | 18 #include "chrome/common/channel_info.h" |
| 19 #include "chrome/common/crash_keys.h" | 19 #include "chrome/common/crash_keys.h" |
| 20 #include "chrome/grit/generated_resources.h" | 20 #include "chrome/grit/generated_resources.h" |
| 21 #include "chrome/grit/theme_resources.h" | |
| 22 #include "components/infobars/core/confirm_infobar_delegate.h" | 21 #include "components/infobars/core/confirm_infobar_delegate.h" |
| 23 #include "components/infobars/core/infobar.h" | 22 #include "components/infobars/core/infobar.h" |
| 24 #include "components/version_info/version_info.h" | 23 #include "components/version_info/version_info.h" |
| 25 #include "content/public/browser/browser_child_process_host_iterator.h" | 24 #include "content/public/browser/browser_child_process_host_iterator.h" |
| 26 #include "content/public/browser/browser_thread.h" | 25 #include "content/public/browser/browser_thread.h" |
| 27 #include "content/public/browser/child_process_data.h" | 26 #include "content/public/browser/child_process_data.h" |
| 28 #include "content/public/browser/notification_details.h" | 27 #include "content/public/browser/notification_details.h" |
| 29 #include "content/public/browser/notification_service.h" | 28 #include "content/public/browser/notification_service.h" |
| 30 #include "content/public/browser/plugin_service.h" | 29 #include "content/public/browser/plugin_service.h" |
| 31 #include "content/public/browser/render_process_host.h" | 30 #include "content/public/browser/render_process_host.h" |
| (...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 428 } | 427 } |
| 429 | 428 |
| 430 void HungPluginTabHelper::CloseBar(PluginState* state) { | 429 void HungPluginTabHelper::CloseBar(PluginState* state) { |
| 431 InfoBarService* infobar_service = | 430 InfoBarService* infobar_service = |
| 432 InfoBarService::FromWebContents(web_contents()); | 431 InfoBarService::FromWebContents(web_contents()); |
| 433 if (infobar_service && state->infobar) { | 432 if (infobar_service && state->infobar) { |
| 434 infobar_service->RemoveInfoBar(state->infobar); | 433 infobar_service->RemoveInfoBar(state->infobar); |
| 435 state->infobar = NULL; | 434 state->infobar = NULL; |
| 436 } | 435 } |
| 437 } | 436 } |
| OLD | NEW |