| Index: chrome/browser/download/download_status_updater_win.cc
|
| diff --git a/chrome/browser/download/download_status_updater_win.cc b/chrome/browser/download/download_status_updater_win.cc
|
| index f63808a468c9149aef4e63d986e0a9ec72c62947..35d82b27dc23855b3a94676cc98549f3b26635b8 100644
|
| --- a/chrome/browser/download/download_status_updater_win.cc
|
| +++ b/chrome/browser/download/download_status_updater_win.cc
|
| @@ -7,30 +7,18 @@
|
| #include <shobjidl.h>
|
| #include <string>
|
|
|
| -#include "base/files/file_path.h"
|
| #include "base/logging.h"
|
| -#include "base/stl_util.h"
|
| -#include "base/strings/string_number_conversions.h"
|
| -#include "base/win/metro.h"
|
| #include "base/win/scoped_comptr.h"
|
| #include "base/win/windows_version.h"
|
| -#include "chrome/browser/platform_util.h"
|
| #include "chrome/browser/ui/browser.h"
|
| #include "chrome/browser/ui/browser_iterator.h"
|
| #include "chrome/browser/ui/browser_window.h"
|
| -#include "content/public/browser/browser_context.h"
|
| -#include "content/public/browser/browser_thread.h"
|
| #include "grit/generated_resources.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| #include "ui/views/win/hwnd_util.h"
|
| -#include "url/gurl.h"
|
| -#include "win8/util/win8_util.h"
|
|
|
| namespace {
|
|
|
| -const char kDownloadNotificationPrefix[] = "DownloadNotification";
|
| -int g_next_notification_id = 0;
|
| -
|
| void UpdateTaskbarProgressBar(int download_count,
|
| bool progress_known,
|
| float progress) {
|
| @@ -68,18 +56,6 @@ void UpdateTaskbarProgressBar(int download_count,
|
| }
|
| }
|
|
|
| -void MetroDownloadNotificationClickedHandler(const wchar_t* download_path) {
|
| - // Metro chrome will invoke these handlers on the metro thread.
|
| - DCHECK(!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
|
| -
|
| - // Ensure that we invoke the function to display the downloaded item on the
|
| - // UI thread.
|
| - content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE,
|
| - base::Bind(platform_util::ShowItemInFolder,
|
| - static_cast<Profile*>(NULL),
|
| - base::FilePath(download_path)));
|
| -}
|
| -
|
| } // namespace
|
|
|
| void DownloadStatusUpdater::UpdateAppIconDownloadProgress(
|
| @@ -90,60 +66,4 @@ void DownloadStatusUpdater::UpdateAppIconDownloadProgress(
|
| int download_count = 0;
|
| bool progress_known = GetProgress(&progress, &download_count);
|
| UpdateTaskbarProgressBar(download_count, progress_known, progress);
|
| -
|
| - // Fire notifications when downloads complete.
|
| - if (!win8::IsSingleWindowMetroMode())
|
| - return;
|
| -
|
| - if (download->GetState() != content::DownloadItem::COMPLETE)
|
| - return;
|
| -
|
| - if (download->GetOpenWhenComplete() ||
|
| - download->ShouldOpenFileBasedOnExtension() ||
|
| - download->IsTemporary() ||
|
| - download->GetAutoOpened())
|
| - return;
|
| -
|
| - // Don't display the Windows8 metro notifications for an incognito download.
|
| - if (download->GetBrowserContext() &&
|
| - download->GetBrowserContext()->IsOffTheRecord())
|
| - return;
|
| -
|
| - // Don't display the Windows 8 metro notifications if we are in the
|
| - // foreground.
|
| - HWND foreground_window = ::GetForegroundWindow();
|
| - if (::IsWindow(foreground_window)) {
|
| - DWORD process_id = 0;
|
| - ::GetWindowThreadProcessId(foreground_window, &process_id);
|
| - if (process_id == ::GetCurrentProcessId())
|
| - return;
|
| - }
|
| -
|
| - // In Windows 8 metro mode display a metro style notification which
|
| - // informs the user that the download is complete.
|
| - HMODULE metro = base::win::GetMetroModule();
|
| - base::win::MetroNotification display_notification =
|
| - reinterpret_cast<base::win::MetroNotification>(
|
| - ::GetProcAddress(metro, "DisplayNotification"));
|
| - DCHECK(display_notification);
|
| - if (display_notification) {
|
| - base::string16 title = l10n_util::GetStringUTF16(
|
| - IDS_METRO_DOWNLOAD_COMPLETE_NOTIFICATION_TITLE);
|
| - base::string16 body = l10n_util::GetStringUTF16(
|
| - IDS_METRO_DOWNLOAD_COMPLETE_NOTIFICATION);
|
| -
|
| - // Dummy notification id. Every metro style notification needs a
|
| - // unique notification id.
|
| - std::string notification_id = kDownloadNotificationPrefix;
|
| - notification_id += base::IntToString(g_next_notification_id++);
|
| -
|
| - display_notification(download->GetURL().spec().c_str(),
|
| - "",
|
| - title.c_str(),
|
| - body.c_str(),
|
| - L"",
|
| - notification_id.c_str(),
|
| - MetroDownloadNotificationClickedHandler,
|
| - download->GetTargetFilePath().value().c_str());
|
| - }
|
| }
|
|
|