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

Unified Diff: chrome/browser/ui/app_list/app_list_view_delegate.cc

Issue 404383002: Experimental app list: custom launcher pages handle web contents events. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 6 years, 5 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/ui/app_list/app_list_view_delegate.cc
diff --git a/chrome/browser/ui/app_list/app_list_view_delegate.cc b/chrome/browser/ui/app_list/app_list_view_delegate.cc
index 542e3b0ecca2b47f508ed18736aa7ded09456a05..a6d2978cb1d09d1cfcb799259a4fa57889ea1cce 100644
--- a/chrome/browser/ui/app_list/app_list_view_delegate.cc
+++ b/chrome/browser/ui/app_list/app_list_view_delegate.cc
@@ -24,6 +24,7 @@
#include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h"
#include "chrome/browser/ui/app_list/search/search_controller.h"
#include "chrome/browser/ui/app_list/start_page_service.h"
+#include "chrome/browser/ui/apps/chrome_app_window_delegate.h"
benwells 2014/08/04 02:35:20 I assume this is part of the 'rebase might be need
Matt Giuca 2014/08/04 06:25:58 Indeed.
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/chrome_pages.h"
#include "chrome/browser/ui/host_desktop.h"
@@ -163,7 +164,9 @@ AppListViewDelegate::AppListViewDelegate(Profile* profile,
LOG(ERROR) << "Invalid custom launcher page URL: "
<< custom_launcher_page_url.possibly_invalid_spec();
} else {
- custom_page_contents_.reset(new apps::CustomLauncherPageContents());
+ std::string extension_id = custom_launcher_page_url.host();
+ custom_page_contents_.reset(new apps::CustomLauncherPageContents(
+ new ChromeAppDelegate, extension_id));
custom_page_contents_->Initialize(profile, custom_launcher_page_url);
}
}
« apps/custom_launcher_page_contents.h ('K') | « apps/custom_launcher_page_contents.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698