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

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

Issue 2628883002: Move CustomLauncherPageContents from apps to c/b/ui/app_list (Closed)
Patch Set: rebase Created 3 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/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 bb8a6fe75b9f88c6c4fea1158954f313619ac266..351bbfeb8123e65356bfeda939ef18207e6675c8 100644
--- a/chrome/browser/ui/app_list/app_list_view_delegate.cc
+++ b/chrome/browser/ui/app_list/app_list_view_delegate.cc
@@ -8,7 +8,6 @@
#include <vector>
-#include "apps/custom_launcher_page_contents.h"
#include "base/callback.h"
#include "base/command_line.h"
#include "base/files/file_path.h"
@@ -29,6 +28,7 @@
#include "chrome/browser/ui/app_list/app_list_service.h"
#include "chrome/browser/ui/app_list/app_list_syncable_service.h"
#include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h"
+#include "chrome/browser/ui/app_list/custom_launcher_page_contents.h"
#include "chrome/browser/ui/app_list/launcher_page_event_dispatcher.h"
#include "chrome/browser/ui/app_list/search/search_controller_factory.h"
#include "chrome/browser/ui/app_list/search/search_resource_manager.h"
@@ -316,7 +316,7 @@ void AppListViewDelegate::SetUpCustomLauncherPages() {
for (auto it = custom_launcher_page_urls.begin();
it != custom_launcher_page_urls.end(); ++it) {
std::string extension_id = it->host();
- auto page_contents = base::MakeUnique<apps::CustomLauncherPageContents>(
+ auto page_contents = base::MakeUnique<app_list::CustomLauncherPageContents>(
base::MakeUnique<ChromeAppDelegate>(false), extension_id);
page_contents->Initialize(profile_, *it);
custom_page_contents_.push_back(std::move(page_contents));
« no previous file with comments | « chrome/browser/ui/app_list/app_list_view_delegate.h ('k') | chrome/browser/ui/app_list/custom_launcher_page_contents.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698