| Index: chrome/browser/guest_view/extension_options/extension_options_guest.cc
|
| diff --git a/chrome/browser/guest_view/extension_options/extension_options_guest.cc b/chrome/browser/guest_view/extension_options/extension_options_guest.cc
|
| index a0296f80566740ed7cc374f065bf7ffa453d0a63..62fa1d2bf0b4cd6b8b0ced7b5220e474ee60c343 100644
|
| --- a/chrome/browser/guest_view/extension_options/extension_options_guest.cc
|
| +++ b/chrome/browser/guest_view/extension_options/extension_options_guest.cc
|
| @@ -9,12 +9,14 @@
|
| #include "chrome/browser/extensions/extension_tab_util.h"
|
| #include "chrome/browser/guest_view/extension_options/extension_options_constants.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| +#include "chrome/browser/task_manager/task_manager_util.h"
|
| #include "chrome/browser/ui/browser.h"
|
| #include "chrome/browser/ui/browser_finder.h"
|
| #include "chrome/browser/ui/browser_window.h"
|
| #include "chrome/browser/ui/tabs/tab_strip_model.h"
|
| #include "chrome/common/extensions/api/extension_options_internal.h"
|
| #include "chrome/common/extensions/manifest_url_handler.h"
|
| +#include "chrome/grit/generated_resources.h"
|
| #include "components/crx_file/id_util.h"
|
| #include "content/public/browser/render_process_host.h"
|
| #include "content/public/browser/site_instance.h"
|
| @@ -27,6 +29,7 @@
|
| #include "extensions/common/feature_switch.h"
|
| #include "extensions/common/permissions/permissions_data.h"
|
| #include "ipc/ipc_message_macros.h"
|
| +#include "ui/base/l10n/l10n_util.h"
|
|
|
| using content::WebContents;
|
| using namespace extensions::api;
|
| @@ -43,10 +46,6 @@ ExtensionOptionsGuest::ExtensionOptionsGuest(
|
| ExtensionOptionsGuest::~ExtensionOptionsGuest() {
|
| }
|
|
|
| -const char* ExtensionOptionsGuest::GetAPINamespace() {
|
| - return extensionoptions::kAPINamespace;
|
| -}
|
| -
|
| // static
|
| extensions::GuestViewBase* ExtensionOptionsGuest::Create(
|
| content::BrowserContext* browser_context,
|
| @@ -128,6 +127,17 @@ void ExtensionOptionsGuest::DidStopLoading() {
|
| args.Pass()));
|
| }
|
|
|
| +const char* ExtensionOptionsGuest::GetAPINamespace() const {
|
| + return extensionoptions::kAPINamespace;
|
| +}
|
| +
|
| +base::string16 ExtensionOptionsGuest::GetTaskName() const {
|
| + const int message_id = IDS_TASK_MANAGER_EXTENSIONOPTIONS_TAG_PREFIX;
|
| + base::string16 title =
|
| + task_manager::util::GetTitleFromWebContents(guest_web_contents());
|
| + return l10n_util::GetStringFUTF16(message_id, title);
|
| +}
|
| +
|
| content::WebContents* ExtensionOptionsGuest::GetAssociatedWebContents() const {
|
| return guest_web_contents();
|
| }
|
|
|