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 816 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
827 std::string histogram_name = user_initiated ? | 827 std::string histogram_name = user_initiated ? |
828 "Extensions.Permissions_ReEnableCancel" : | 828 "Extensions.Permissions_ReEnableCancel" : |
829 "Extensions.Permissions_ReEnableAbort"; | 829 "Extensions.Permissions_ReEnableAbort"; |
830 ExtensionService::RecordPermissionMessagesHistogram( | 830 ExtensionService::RecordPermissionMessagesHistogram( |
831 extension, histogram_name.c_str()); | 831 extension, histogram_name.c_str()); |
832 | 832 |
833 extension_enable_flow_.reset(); | 833 extension_enable_flow_.reset(); |
834 CleanupAfterUninstall(); | 834 CleanupAfterUninstall(); |
835 } | 835 } |
836 | 836 |
837 ExtensionUninstallDialog* AppLauncherHandler::GetExtensionUninstallDialog() { | 837 extensions::ExtensionUninstallDialog* |
| 838 AppLauncherHandler::GetExtensionUninstallDialog() { |
838 if (!extension_uninstall_dialog_.get()) { | 839 if (!extension_uninstall_dialog_.get()) { |
839 Browser* browser = chrome::FindBrowserWithWebContents( | 840 Browser* browser = chrome::FindBrowserWithWebContents( |
840 web_ui()->GetWebContents()); | 841 web_ui()->GetWebContents()); |
841 extension_uninstall_dialog_.reset( | 842 extension_uninstall_dialog_.reset( |
842 ExtensionUninstallDialog::Create(extension_service_->profile(), | 843 extensions::ExtensionUninstallDialog::Create( |
843 browser, this)); | 844 extension_service_->profile(), browser, this)); |
844 } | 845 } |
845 return extension_uninstall_dialog_.get(); | 846 return extension_uninstall_dialog_.get(); |
846 } | 847 } |
OLD | NEW |