| 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 <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 #include "chrome/browser/ui/browser_window.h" | 32 #include "chrome/browser/ui/browser_window.h" |
| 33 #include "chrome/browser/ui/extensions/application_launch.h" | 33 #include "chrome/browser/ui/extensions/application_launch.h" |
| 34 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" | 34 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" |
| 35 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" | 35 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" |
| 36 #include "chrome/browser/ui/webui/web_ui_util.h" | 36 #include "chrome/browser/ui/webui/web_ui_util.h" |
| 37 #include "chrome/common/chrome_notification_types.h" | 37 #include "chrome/common/chrome_notification_types.h" |
| 38 #include "chrome/common/extensions/extension.h" | 38 #include "chrome/common/extensions/extension.h" |
| 39 #include "chrome/common/extensions/extension_constants.h" | 39 #include "chrome/common/extensions/extension_constants.h" |
| 40 #include "chrome/common/extensions/extension_icon_set.h" | 40 #include "chrome/common/extensions/extension_icon_set.h" |
| 41 #include "chrome/common/extensions/extension_resource.h" | 41 #include "chrome/common/extensions/extension_resource.h" |
| 42 #include "chrome/common/favicon_url.h" | |
| 43 #include "chrome/common/pref_names.h" | 42 #include "chrome/common/pref_names.h" |
| 44 #include "chrome/common/url_constants.h" | 43 #include "chrome/common/url_constants.h" |
| 45 #include "chrome/common/web_apps.h" | 44 #include "chrome/common/web_apps.h" |
| 46 #include "content/public/browser/notification_service.h" | 45 #include "content/public/browser/notification_service.h" |
| 47 #include "content/public/browser/web_ui.h" | 46 #include "content/public/browser/web_ui.h" |
| 47 #include "content/public/common/favicon_url.h" |
| 48 #include "googleurl/src/gurl.h" | 48 #include "googleurl/src/gurl.h" |
| 49 #include "grit/browser_resources.h" | 49 #include "grit/browser_resources.h" |
| 50 #include "grit/generated_resources.h" | 50 #include "grit/generated_resources.h" |
| 51 #include "net/base/escape.h" | 51 #include "net/base/escape.h" |
| 52 #include "ui/base/l10n/l10n_util.h" | 52 #include "ui/base/l10n/l10n_util.h" |
| 53 #include "ui/gfx/favicon_size.h" | 53 #include "ui/gfx/favicon_size.h" |
| 54 | 54 |
| 55 using application_launch::LaunchParams; | 55 using application_launch::LaunchParams; |
| 56 using application_launch::OpenApplication; | 56 using application_launch::OpenApplication; |
| 57 using content::WebContents; | 57 using content::WebContents; |
| (...skipping 865 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 923 return extension_uninstall_dialog_.get(); | 923 return extension_uninstall_dialog_.get(); |
| 924 } | 924 } |
| 925 | 925 |
| 926 ExtensionInstallPrompt* AppLauncherHandler::GetExtensionInstallPrompt() { | 926 ExtensionInstallPrompt* AppLauncherHandler::GetExtensionInstallPrompt() { |
| 927 if (!extension_install_ui_.get()) { | 927 if (!extension_install_ui_.get()) { |
| 928 extension_install_ui_.reset( | 928 extension_install_ui_.reset( |
| 929 new ExtensionInstallPrompt(web_ui()->GetWebContents())); | 929 new ExtensionInstallPrompt(web_ui()->GetWebContents())); |
| 930 } | 930 } |
| 931 return extension_install_ui_.get(); | 931 return extension_install_ui_.get(); |
| 932 } | 932 } |
| OLD | NEW |