diff options
| author | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-16 09:47:31 +0000 |
|---|---|---|
| committer | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-16 09:47:31 +0000 |
| commit | 11d9b2e7d3578838121a0de6bfbe454c39238afe (patch) | |
| tree | b649fae92710cd5145db39a062ae08a87d60650f | |
| parent | 122573c1978388209147eb14879a7694c86a586b (diff) | |
| download | chromium_src-11d9b2e7d3578838121a0de6bfbe454c39238afe.zip chromium_src-11d9b2e7d3578838121a0de6bfbe454c39238afe.tar.gz chromium_src-11d9b2e7d3578838121a0de6bfbe454c39238afe.tar.bz2 | |
Enable on-demand update checks in desktop Aura on Windows.
This change reverts http://crrev.com/146745.
BUG=175484
TEST=Install at user or system level on a machine that has Google Update installed at the same level and visit chrome://help. Notice that an update check takes place.
TBR=brettw@chromium.org
Review URL: https://chromiumcodereview.appspot.com/12588013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188570 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/google/google_update_win.cc | 4 | ||||
| -rw-r--r-- | chrome/chrome_browser.gypi | 2 | ||||
| -rw-r--r-- | chrome/chrome_browser_ui.gypi | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/chrome/browser/google/google_update_win.cc b/chrome/browser/google/google_update_win.cc index ee732bf..cfa08c6 100644 --- a/chrome/browser/google/google_update_win.cc +++ b/chrome/browser/google/google_update_win.cc @@ -24,6 +24,7 @@ #include "google_update/google_update_idl.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/base/win/atl_module.h" #include "ui/views/widget/widget.h" using content::BrowserThread; @@ -259,6 +260,9 @@ void GoogleUpdate::InitiateGoogleUpdateCheck(bool install_if_newer, return; } + // Make sure ATL is initialized in this module. + ui::win::CreateATLModuleIfNeeded(); + CComObject<GoogleUpdateJobObserver>* job_observer; HRESULT hr = CComObject<GoogleUpdateJobObserver>::CreateInstance(&job_observer); diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 039d970..91c1130 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -2553,8 +2553,6 @@ ['use_aura==1', { 'sources/': [ ['exclude', '^browser/automation/testing_automation_provider_win.cc'], - ['exclude', '^browser/google/google_update_win.cc'], - ['exclude', '^browser/google/google_update_win.h'], ['exclude', '^browser/hang_monitor/hung_plugin_action.cc'], ['exclude', '^browser/hang_monitor/hung_plugin_action.h'], ['exclude', '^browser/hang_monitor/hung_window_detector.cc'], diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi index 21a03f8..50796fc 100644 --- a/chrome/chrome_browser_ui.gypi +++ b/chrome/chrome_browser_ui.gypi @@ -2457,7 +2457,6 @@ ['exclude', '^browser/ui/views/user_data_dir_dialog_view.cc'], ['exclude', '^browser/ui/views/tab_contents/web_drag_bookmark_handler_win.cc'], ['exclude', '^browser/ui/views/tab_contents/web_drag_bookmark_handler_win.h'], - ['exclude', '^browser/ui/webui/help/version_updater_win.cc'], ['exclude', '^browser/ui/webui/task_manager/'], ['exclude', '^browser/ui/window_sizer/window_sizer_win.cc'], # TODO: (stevenjb/beng): Find a home for these. @@ -2483,8 +2482,6 @@ ['exclude', '^browser/ui/webui/certificate_viewer_ui.cc'], ['exclude', '^browser/ui/webui/certificate_viewer_ui.h'], ['include', 'browser/ui/browser_win.cc'], - ['include', 'browser/ui/webui/help/version_updater_basic.cc'], - ['include', 'browser/ui/webui/help/version_updater_basic.h'], ], }, { 'sources/': [ |