Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1508)

Unified Diff: chrome/browser/extensions/tab_helper.cc

Issue 899443002: Create bookmark apps at the end of the process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Hopefully last test Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/tab_helper.cc
diff --git a/chrome/browser/extensions/tab_helper.cc b/chrome/browser/extensions/tab_helper.cc
index 9f05f938ff1f5ea3352835b66822fd5dee96159b..d5c48c99584df3385389c5c3370864c361e07148 100644
--- a/chrome/browser/extensions/tab_helper.cc
+++ b/chrome/browser/extensions/tab_helper.cc
@@ -26,7 +26,6 @@
#include "chrome/browser/ui/browser_commands.h"
#include "chrome/browser/ui/browser_dialogs.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/chrome_extension_messages.h"
@@ -60,10 +59,6 @@
#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
@@ -198,19 +193,6 @@ 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) {
@@ -319,9 +301,8 @@ void TabHelper::OnDidGetWebApplicationInfo(const WebApplicationInfo& info) {
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_.reset(
+ new BookmarkAppHelper(profile_, web_app_info_, web_contents()));
bookmark_app_helper_->Create(base::Bind(
&TabHelper::FinishCreateBookmarkApp, weak_ptr_factory_.GetWeakPtr()));
break;

Powered by Google App Engine
This is Rietveld 408576698