#include "chrome/browser/extensions/tab_helper.h"
+#include "base/command_line.h"
#include "base/logging.h"
#include "base/strings/string_util.h"
+#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/extensions/active_script_controller.h"
#include "chrome/browser/extensions/activity_log/activity_log.h"
#include "chrome/browser/extensions/api/declarative/rules_registry_service.h"
#include "chrome/browser/extensions/api/declarative_content/content_rules_registry.h"
-#include "chrome/browser/extensions/crx_installer.h"
+#include "chrome/browser/extensions/api/webstore/webstore_api.h"
+#include "chrome/browser/extensions/bookmark_app_helper.h"
#include "chrome/browser/extensions/error_console/error_console.h"
#include "chrome/browser/extensions/extension_action.h"
#include "chrome/browser/extensions/extension_action_manager.h"
#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/extensions/extension_tab_util.h"
-#include "chrome/browser/extensions/image_loader.h"
-#include "chrome/browser/extensions/page_action_controller.h"
-#include "chrome/browser/extensions/script_badge_controller.h"
-#include "chrome/browser/extensions/script_bubble_controller.h"
-#include "chrome/browser/extensions/script_executor.h"
+#include "chrome/browser/extensions/location_bar_controller.h"
#include "chrome/browser/extensions/webstore_inline_installer.h"
#include "chrome/browser/extensions/webstore_inline_installer_factory.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/sessions/session_id.h"
#include "chrome/browser/sessions/session_tab_helper.h"
+#include "chrome/browser/shell_integration.h"
+#include "chrome/browser/ui/browser_commands.h"
#include "chrome/browser/ui/browser_dialogs.h"
-#include "chrome/browser/ui/web_applications/web_app_ui.h"
+#include "chrome/browser/ui/browser_finder.h"
+#include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/host_desktop.h"
#include "chrome/browser/web_applications/web_app.h"
-#include "chrome/common/extensions/extension.h"
+#include "chrome/common/chrome_switches.h"
+#include "chrome/common/extensions/chrome_extension_messages.h"
#include "chrome/common/extensions/extension_constants.h"
-#include "chrome/common/extensions/extension_icon_set.h"
-#include "chrome/common/extensions/extension_messages.h"
-#include "chrome/common/extensions/feature_switch.h"
#include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
-#include "chrome/common/extensions/manifest_handlers/icons_handler.h"
#include "chrome/common/render_messages.h"
+#include "chrome/common/url_constants.h"
#include "content/public/browser/invalidate_type.h"
#include "content/public/browser/navigation_controller.h"
#include "content/public/browser/navigation_details.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/render_widget_host_view.h"
#include "content/public/browser/web_contents.h"
-#include "content/public/browser/web_contents_view.h"
+#include "content/public/common/frame_navigate_params.h"
#include "extensions/browser/extension_error.h"
+#include "extensions/browser/extension_registry.h"
+#include "extensions/browser/extension_system.h"
+#include "extensions/browser/image_loader.h"
+#include "extensions/common/constants.h"
+#include "extensions/common/extension.h"
+#include "extensions/common/extension_icon_set.h"
+#include "extensions/common/extension_messages.h"
#include "extensions/common/extension_resource.h"
#include "extensions/common/extension_urls.h"
-#include "ui/gfx/image/image.h"
+#include "extensions/common/feature_switch.h"
+#include "extensions/common/manifest_handlers/icons_handler.h"
+
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
+#endif
+
+#if defined(OS_WIN)
+#include "chrome/browser/web_applications/web_app_win.h"
+#endif
using content::NavigationController;
using content::NavigationEntry;
namespace extensions {
-TabHelper::ScriptExecutionObserver::ScriptExecutionObserver(
- TabHelper* tab_helper)
- : tab_helper_(tab_helper) {
- tab_helper_->AddScriptExecutionObserver(this);
-}
-
-TabHelper::ScriptExecutionObserver::ScriptExecutionObserver()
- : tab_helper_(NULL) {
-}
-
-TabHelper::ScriptExecutionObserver::~ScriptExecutionObserver() {
- if (tab_helper_)
- tab_helper_->RemoveScriptExecutionObserver(this);
-}
-
TabHelper::TabHelper(content::WebContents* web_contents)
: content::WebContentsObserver(web_contents),
extension_app_(NULL),
extension_function_dispatcher_(
- Profile::FromBrowserContext(web_contents->GetBrowserContext()), this),
+ Profile::FromBrowserContext(web_contents->GetBrowserContext()),
+ this),
pending_web_app_action_(NONE),
- script_executor_(new ScriptExecutor(web_contents,
- &script_execution_observers_)),
+ last_committed_page_id_(-1),
+ update_shortcut_on_load_complete_(false),
+ script_executor_(
+ new ScriptExecutor(web_contents, &script_execution_observers_)),
+ location_bar_controller_(new LocationBarController(web_contents)),
image_loader_ptr_factory_(this),
webstore_inline_installer_factory_(new WebstoreInlineInstallerFactory()) {
// The ActiveTabPermissionManager requires a session ID; ensure this
web_contents,
SessionID::IdForTab(web_contents),
Profile::FromBrowserContext(web_contents->GetBrowserContext())));
- if (FeatureSwitch::script_badges()->IsEnabled()) {
- location_bar_controller_.reset(
- new ScriptBadgeController(web_contents, this));
- } else {
- location_bar_controller_.reset(
- new PageActionController(web_contents));
- }
-
- if (FeatureSwitch::script_bubble()->IsEnabled()) {
- script_bubble_controller_.reset(
- new ScriptBubbleController(web_contents, this));
- }
// If more classes need to listen to global content script activity, then
// a separate routing class with an observer interface should be written.
profile_ = Profile::FromBrowserContext(web_contents->GetBrowserContext());
-#if defined(ENABLE_EXTENSIONS)
AddScriptExecutionObserver(ActivityLog::GetInstance(profile_));
-#endif
registrar_.Add(this,
content::NOTIFICATION_LOAD_STOP,
content::Source<NavigationController>(
&web_contents->GetController()));
-
- registrar_.Add(this,
- chrome::NOTIFICATION_EXTENSION_UNLOADED,
- content::NotificationService::AllSources());
}
TabHelper::~TabHelper() {
-#if defined(ENABLE_EXTENSIONS)
RemoveScriptExecutionObserver(ActivityLog::GetInstance(profile_));
-#endif
}
void TabHelper::CreateApplicationShortcuts() {
DCHECK(CanCreateApplicationShortcuts());
- NavigationEntry* entry =
- web_contents()->GetController().GetLastCommittedEntry();
- if (!entry)
- return;
-
- pending_web_app_action_ = CREATE_SHORTCUT;
+ // Start fetching web app info for CreateApplicationShortcut dialog and show
+ // the dialog when the data is available in OnDidGetApplicationInfo.
+ GetApplicationInfo(CREATE_SHORTCUT);
+}
+void TabHelper::CreateHostedAppFromWebContents() {
+ DCHECK(CanCreateBookmarkApp());
// Start fetching web app info for CreateApplicationShortcut dialog and show
// the dialog when the data is available in OnDidGetApplicationInfo.
- GetApplicationInfo(entry->GetPageID());
+ GetApplicationInfo(CREATE_HOSTED_APP);
}
bool TabHelper::CanCreateApplicationShortcuts() const {
#endif
}
+bool TabHelper::CanCreateBookmarkApp() const {
+#if defined(OS_MACOSX)
+ return false;
+#else
+ return IsValidBookmarkAppUrl(web_contents()->GetURL()) &&
+ pending_web_app_action_ == NONE;
+#endif
+}
+
+void TabHelper::AddScriptExecutionObserver(ScriptExecutionObserver* observer) {
+ script_execution_observers_.AddObserver(observer);
+}
+
+void TabHelper::RemoveScriptExecutionObserver(
+ ScriptExecutionObserver* observer) {
+ script_execution_observers_.RemoveObserver(observer);
+}
+
void TabHelper::SetExtensionApp(const Extension* extension) {
DCHECK(!extension || AppLaunchInfo::GetFullLaunchURL(extension).is_valid());
+ if (extension_app_ == extension)
+ return;
+
extension_app_ = extension;
UpdateExtensionAppIcon(extension_app_);
return &extension_app_icon_;
}
+void TabHelper::FinishCreateBookmarkApp(
+ const Extension* extension,
+ const WebApplicationInfo& web_app_info) {
+ pending_web_app_action_ = NONE;
+
+ // There was an error with downloading the icons or installing the app.
+ if (!extension)
+ return;
+
+#if defined(OS_CHROMEOS)
+ ChromeLauncherController::instance()->PinAppWithID(extension->id());
+#endif
+
+ Browser* browser = chrome::FindBrowserWithWebContents(web_contents());
+ if (browser) {
+ browser->window()->ShowBookmarkAppBubble(web_app_info, extension->id());
+ }
+}
+
void TabHelper::RenderViewCreated(RenderViewHost* render_view_host) {
SetTabId(render_view_host);
}
void TabHelper::DidNavigateMainFrame(
const content::LoadCommittedDetails& details,
const content::FrameNavigateParams& params) {
-#if defined(ENABLE_EXTENSIONS)
if (ExtensionSystem::Get(profile_)->extension_service() &&
RulesRegistryService::Get(profile_)) {
RulesRegistryService::Get(profile_)->content_rules_registry()->
DidNavigateMainFrame(web_contents(), details, params);
}
-#endif // defined(ENABLE_EXTENSIONS)
- if (details.is_in_page)
- return;
+ content::BrowserContext* context = web_contents()->GetBrowserContext();
+ ExtensionRegistry* registry = ExtensionRegistry::Get(context);
+ const ExtensionSet& enabled_extensions = registry->enabled_extensions();
+
+ if (CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableStreamlinedHostedApps)) {
+ Browser* browser = chrome::FindBrowserWithWebContents(web_contents());
+ if (browser && browser->is_app()) {
+ SetExtensionApp(registry->GetExtensionById(
+ web_app::GetExtensionIdFromApplicationName(browser->app_name()),
+ ExtensionRegistry::EVERYTHING));
+ } else {
+ UpdateExtensionAppIcon(
+ enabled_extensions.GetExtensionOrAppByURL(params.url));
+ }
+ } else {
+ UpdateExtensionAppIcon(
+ enabled_extensions.GetExtensionOrAppByURL(params.url));
+ }
- Profile* profile =
- Profile::FromBrowserContext(web_contents()->GetBrowserContext());
- ExtensionService* service = profile->GetExtensionService();
- if (!service)
+ if (details.is_in_page)
return;
ExtensionActionManager* extension_action_manager =
- ExtensionActionManager::Get(profile);
- for (ExtensionSet::const_iterator it = service->extensions()->begin();
- it != service->extensions()->end(); ++it) {
+ ExtensionActionManager::Get(Profile::FromBrowserContext(context));
+ for (ExtensionSet::const_iterator it = enabled_extensions.begin();
+ it != enabled_extensions.end();
+ ++it) {
ExtensionAction* browser_action =
extension_action_manager->GetBrowserAction(*it->get());
if (browser_action) {
browser_action->ClearAllValuesForTab(SessionID::IdForTab(web_contents()));
content::NotificationService::current()->Notify(
- chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_UPDATED,
+ extensions::NOTIFICATION_EXTENSION_BROWSER_ACTION_UPDATED,
content::Source<ExtensionAction>(browser_action),
content::NotificationService::NoDetails());
}
bool TabHelper::OnMessageReceived(const IPC::Message& message) {
bool handled = true;
IPC_BEGIN_MESSAGE_MAP(TabHelper, message)
- IPC_MESSAGE_HANDLER(ExtensionHostMsg_DidGetApplicationInfo,
+ IPC_MESSAGE_HANDLER(ChromeExtensionHostMsg_DidGetApplicationInfo,
OnDidGetApplicationInfo)
IPC_MESSAGE_HANDLER(ExtensionHostMsg_InlineWebstoreInstall,
OnInlineWebstoreInstall)
OnContentScriptsExecuting)
IPC_MESSAGE_HANDLER(ExtensionHostMsg_OnWatchedPageChange,
OnWatchedPageChange)
+ IPC_MESSAGE_UNHANDLED(handled = false)
+ IPC_END_MESSAGE_MAP()
+ return handled;
+}
+
+bool TabHelper::OnMessageReceived(const IPC::Message& message,
+ content::RenderFrameHost* render_frame_host) {
+ bool handled = true;
+ IPC_BEGIN_MESSAGE_MAP(TabHelper, message)
IPC_MESSAGE_HANDLER(ChromeViewHostMsg_DetailedConsoleMessageAdded,
OnDetailedConsoleMessageAdded)
IPC_MESSAGE_UNHANDLED(handled = false)
new_helper->extension_app_icon_ = extension_app_icon_;
}
-void TabHelper::OnDidGetApplicationInfo(int32 page_id,
- const WebApplicationInfo& info) {
- // Android does not implement BrowserWindow.
-#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
+void TabHelper::OnDidGetApplicationInfo(const WebApplicationInfo& info) {
+#if !defined(OS_MACOSX)
web_app_info_ = info;
NavigationEntry* entry =
web_contents()->GetController().GetLastCommittedEntry();
- if (!entry || (entry->GetPageID() != page_id))
+ if (!entry || last_committed_page_id_ != entry->GetPageID())
return;
+ last_committed_page_id_ = -1;
switch (pending_web_app_action_) {
case CREATE_SHORTCUT: {
chrome::ShowCreateWebAppShortcutsDialog(
- web_contents()->GetView()->GetTopLevelNativeWindow(),
+ web_contents()->GetTopLevelNativeWindow(),
web_contents());
break;
}
+ case CREATE_HOSTED_APP: {
+ if (web_app_info_.app_url.is_empty())
+ web_app_info_.app_url = web_contents()->GetURL();
+
+ if (web_app_info_.title.empty())
+ web_app_info_.title = web_contents()->GetTitle();
+ if (web_app_info_.title.empty())
+ web_app_info_.title = base::UTF8ToUTF16(web_app_info_.app_url.spec());
+
+ bookmark_app_helper_.reset(new BookmarkAppHelper(
+ ExtensionSystem::Get(profile_)->extension_service(),
+ web_app_info_, web_contents()));
+ bookmark_app_helper_->Create(base::Bind(
+ &TabHelper::FinishCreateBookmarkApp, base::Unretained(this)));
+ break;
+ }
case UPDATE_SHORTCUT: {
web_app::UpdateShortcutForTabContents(web_contents());
break;
break;
}
- pending_web_app_action_ = NONE;
+ // The hosted app action will be cleared once the installation completes or
+ // fails.
+ if (pending_web_app_action_ != CREATE_HOSTED_APP)
+ pending_web_app_action_ = NONE;
#endif
}
-void TabHelper::OnInlineWebstoreInstall(
- int install_id,
- int return_route_id,
- const std::string& webstore_item_id,
- const GURL& requestor_url) {
+void TabHelper::OnInlineWebstoreInstall(int install_id,
+ int return_route_id,
+ const std::string& webstore_item_id,
+ const GURL& requestor_url,
+ int listeners_mask) {
+ // Check that the listener is reasonable. We should never get anything other
+ // than an install stage listener, a download listener, or both.
+ if ((listeners_mask & ~(api::webstore::INSTALL_STAGE_LISTENER |
+ api::webstore::DOWNLOAD_PROGRESS_LISTENER)) != 0) {
+ NOTREACHED();
+ return;
+ }
+ // Inform the Webstore API that an inline install is happening, in case the
+ // page requested status updates.
+ Profile* profile =
+ Profile::FromBrowserContext(web_contents()->GetBrowserContext());
+ WebstoreAPI::Get(profile)->OnInlineInstallStart(
+ return_route_id, this, webstore_item_id, listeners_mask);
+
WebstoreStandaloneInstaller::Callback callback =
- base::Bind(&TabHelper::OnInlineInstallComplete, base::Unretained(this),
- install_id, return_route_id);
+ base::Bind(&TabHelper::OnInlineInstallComplete,
+ base::Unretained(this),
+ install_id,
+ return_route_id);
scoped_refptr<WebstoreInlineInstaller> installer(
webstore_inline_installer_factory_->CreateInstaller(
web_contents(),
void TabHelper::OnGetAppInstallState(const GURL& requestor_url,
int return_route_id,
int callback_id) {
- Profile* profile =
- Profile::FromBrowserContext(web_contents()->GetBrowserContext());
- ExtensionService* extension_service = profile->GetExtensionService();
- const ExtensionSet* extensions = extension_service->extensions();
- const ExtensionSet* disabled = extension_service->disabled_extensions();
+ ExtensionRegistry* registry =
+ ExtensionRegistry::Get(web_contents()->GetBrowserContext());
+ const ExtensionSet& extensions = registry->enabled_extensions();
+ const ExtensionSet& disabled_extensions = registry->disabled_extensions();
std::string state;
- if (extensions->GetHostedAppByURL(requestor_url))
+ if (extensions.GetHostedAppByURL(requestor_url))
state = extension_misc::kAppStateInstalled;
- else if (disabled->GetHostedAppByURL(requestor_url))
+ else if (disabled_extensions.GetHostedAppByURL(requestor_url))
state = extension_misc::kAppStateDisabled;
else
state = extension_misc::kAppStateNotInstalled;
void TabHelper::OnContentScriptsExecuting(
const ScriptExecutionObserver::ExecutingScriptsMap& executing_scripts_map,
- int32 on_page_id,
const GURL& on_url) {
- FOR_EACH_OBSERVER(ScriptExecutionObserver, script_execution_observers_,
- OnScriptsExecuted(web_contents(),
- executing_scripts_map,
- on_page_id,
- on_url));
+ FOR_EACH_OBSERVER(
+ ScriptExecutionObserver,
+ script_execution_observers_,
+ OnScriptsExecuted(web_contents(), executing_scripts_map, on_url));
}
void TabHelper::OnWatchedPageChange(
const std::vector<std::string>& css_selectors) {
-#if defined(ENABLE_EXTENSIONS)
if (ExtensionSystem::Get(profile_)->extension_service() &&
RulesRegistryService::Get(profile_)) {
RulesRegistryService::Get(profile_)->content_rules_registry()->Apply(
web_contents(), css_selectors);
}
-#endif // defined(ENABLE_EXTENSIONS)
}
void TabHelper::OnDetailedConsoleMessageAdded(
content::RenderViewHost* rvh = web_contents()->GetRenderViewHost();
ErrorConsole::Get(profile_)->ReportError(
scoped_ptr<ExtensionError>(new RuntimeError(
- extension_app_ ? extension_app_->id() : EmptyString(),
+ extension_app_ ? extension_app_->id() : std::string(),
profile_->IsOffTheRecord(),
source,
message,
if (extension_app_id.empty())
return NULL;
- Profile* profile =
- Profile::FromBrowserContext(web_contents()->GetBrowserContext());
- ExtensionService* extension_service = profile->GetExtensionService();
- if (!extension_service || !extension_service->is_ready())
- return NULL;
-
- const Extension* extension =
- extension_service->GetExtensionById(extension_app_id, false);
- return extension;
+ content::BrowserContext* context = web_contents()->GetBrowserContext();
+ return ExtensionRegistry::Get(context)->enabled_extensions().GetByID(
+ extension_app_id);
}
void TabHelper::UpdateExtensionAppIcon(const Extension* extension) {
if (extension) {
Profile* profile =
Profile::FromBrowserContext(web_contents()->GetBrowserContext());
- extensions::ImageLoader* loader = extensions::ImageLoader::Get(profile);
+ ImageLoader* loader = ImageLoader::Get(profile);
loader->LoadImageAsync(
extension,
IconsInfo::GetIconResource(extension,
- extension_misc::EXTENSION_ICON_SMALLISH,
- ExtensionIconSet::MATCH_EXACTLY),
- gfx::Size(extension_misc::EXTENSION_ICON_SMALLISH,
- extension_misc::EXTENSION_ICON_SMALLISH),
+ extension_misc::EXTENSION_ICON_SMALL,
+ ExtensionIconSet::MATCH_BIGGER),
+ gfx::Size(extension_misc::EXTENSION_ICON_SMALL,
+ extension_misc::EXTENSION_ICON_SMALL),
base::Bind(&TabHelper::OnImageLoaded,
image_loader_ptr_factory_.GetWeakPtr()));
}
void TabHelper::OnInlineInstallComplete(int install_id,
int return_route_id,
bool success,
- const std::string& error) {
+ const std::string& error,
+ webstore_install::Result result) {
Send(new ExtensionMsg_InlineWebstoreInstallResponse(
- return_route_id, install_id, success, success ? std::string() : error));
+ return_route_id,
+ install_id,
+ success,
+ success ? std::string() : error,
+ result));
}
WebContents* TabHelper::GetAssociatedWebContents() const {
return web_contents();
}
-void TabHelper::GetApplicationInfo(int32 page_id) {
- Send(new ExtensionMsg_GetApplicationInfo(routing_id(), page_id));
+void TabHelper::GetApplicationInfo(WebAppAction action) {
+ NavigationEntry* entry =
+ web_contents()->GetController().GetLastCommittedEntry();
+ if (!entry)
+ return;
+
+ pending_web_app_action_ = action;
+ last_committed_page_id_ = entry->GetPageID();
+
+ Send(new ChromeExtensionMsg_GetApplicationInfo(routing_id()));
}
void TabHelper::Observe(int type,
const content::NotificationSource& source,
const content::NotificationDetails& details) {
- switch (type) {
- case content::NOTIFICATION_LOAD_STOP: {
- const NavigationController& controller =
- *content::Source<NavigationController>(source).ptr();
- DCHECK_EQ(controller.GetWebContents(), web_contents());
-
- if (pending_web_app_action_ == UPDATE_SHORTCUT) {
- // Schedule a shortcut update when web application info is available if
- // last committed entry is not NULL. Last committed entry could be NULL
- // when an interstitial page is injected (e.g. bad https certificate,
- // malware site etc). When this happens, we abort the shortcut update.
- NavigationEntry* entry = controller.GetLastCommittedEntry();
- if (entry)
- GetApplicationInfo(entry->GetPageID());
- else
- pending_web_app_action_ = NONE;
- }
- break;
- }
-
- case chrome::NOTIFICATION_EXTENSION_UNLOADED: {
- if (script_bubble_controller_) {
- script_bubble_controller_->OnExtensionUnloaded(
- content::Details<extensions::UnloadedExtensionInfo>(
- details)->extension->id());
- break;
- }
- }
+ DCHECK_EQ(content::NOTIFICATION_LOAD_STOP, type);
+ const NavigationController& controller =
+ *content::Source<NavigationController>(source).ptr();
+ DCHECK_EQ(controller.GetWebContents(), web_contents());
+
+ if (update_shortcut_on_load_complete_) {
+ update_shortcut_on_load_complete_ = false;
+ // Schedule a shortcut update when web application info is available if
+ // last committed entry is not NULL. Last committed entry could be NULL
+ // when an interstitial page is injected (e.g. bad https certificate,
+ // malware site etc). When this happens, we abort the shortcut update.
+ if (controller.GetLastCommittedEntry())
+ GetApplicationInfo(UPDATE_SHORTCUT);
}
}
projects / platform / framework / web / crosswalk.git / blobdiff