OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h" | 5 #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "apps/metrics_names.h" | 9 #include "apps/metrics_names.h" |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 673 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
684 CHECK(args->GetString(1, &title)); | 684 CHECK(args->GetString(1, &title)); |
685 | 685 |
686 double page_index; | 686 double page_index; |
687 CHECK(args->GetDouble(2, &page_index)); | 687 CHECK(args->GetDouble(2, &page_index)); |
688 AppSorting* app_sorting = | 688 AppSorting* app_sorting = |
689 ExtensionPrefs::Get(extension_service_->profile())->app_sorting(); | 689 ExtensionPrefs::Get(extension_service_->profile())->app_sorting(); |
690 const syncer::StringOrdinal& page_ordinal = | 690 const syncer::StringOrdinal& page_ordinal = |
691 app_sorting->PageIntegerAsStringOrdinal(static_cast<size_t>(page_index)); | 691 app_sorting->PageIntegerAsStringOrdinal(static_cast<size_t>(page_index)); |
692 | 692 |
693 Profile* profile = Profile::FromWebUI(web_ui()); | 693 Profile* profile = Profile::FromWebUI(web_ui()); |
694 FaviconService* favicon_service = | 694 FaviconService* favicon_service = FaviconServiceFactory::GetForProfile( |
695 FaviconServiceFactory::GetForProfile(profile, Profile::EXPLICIT_ACCESS); | 695 profile, ServiceAccessType::EXPLICIT_ACCESS); |
696 if (!favicon_service) { | 696 if (!favicon_service) { |
697 LOG(ERROR) << "No favicon service"; | 697 LOG(ERROR) << "No favicon service"; |
698 return; | 698 return; |
699 } | 699 } |
700 | 700 |
701 scoped_ptr<AppInstallInfo> install_info(new AppInstallInfo()); | 701 scoped_ptr<AppInstallInfo> install_info(new AppInstallInfo()); |
702 install_info->title = title; | 702 install_info->title = title; |
703 install_info->app_url = launch_url; | 703 install_info->app_url = launch_url; |
704 install_info->page_ordinal = page_ordinal; | 704 install_info->page_ordinal = page_ordinal; |
705 | 705 |
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
845 Browser* browser = chrome::FindBrowserWithWebContents( | 845 Browser* browser = chrome::FindBrowserWithWebContents( |
846 web_ui()->GetWebContents()); | 846 web_ui()->GetWebContents()); |
847 extension_uninstall_dialog_.reset( | 847 extension_uninstall_dialog_.reset( |
848 extensions::ExtensionUninstallDialog::Create( | 848 extensions::ExtensionUninstallDialog::Create( |
849 extension_service_->profile(), | 849 extension_service_->profile(), |
850 browser->window()->GetNativeWindow(), | 850 browser->window()->GetNativeWindow(), |
851 this)); | 851 this)); |
852 } | 852 } |
853 return extension_uninstall_dialog_.get(); | 853 return extension_uninstall_dialog_.get(); |
854 } | 854 } |
OLD | NEW |