Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(73)

Side by Side Diff: chrome/browser/google/google_update_win.cc

Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/google/google_update_win.h" 5 #include "chrome/browser/google/google_update_win.h"
6 6
7 #include <atlbase.h> 7 #include <atlbase.h>
8 #include <atlcom.h> 8 #include <atlcom.h>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/files/file_path.h" 11 #include "base/files/file_path.h"
12 #include "base/message_loop/message_loop.h" 12 #include "base/message_loop/message_loop.h"
13 #include "base/path_service.h" 13 #include "base/path_service.h"
14 #include "base/strings/string_util.h" 14 #include "base/strings/string_util.h"
15 #include "base/strings/stringprintf.h" 15 #include "base/strings/stringprintf.h"
16 #include "base/threading/thread.h" 16 #include "base/threading/thread.h"
17 #include "base/win/scoped_comptr.h" 17 #include "base/win/scoped_comptr.h"
18 #include "base/win/windows_version.h" 18 #include "base/win/windows_version.h"
19 #include "chrome/grit/generated_resources.h"
19 #include "chrome/installer/util/browser_distribution.h" 20 #include "chrome/installer/util/browser_distribution.h"
20 #include "chrome/installer/util/google_update_settings.h" 21 #include "chrome/installer/util/google_update_settings.h"
21 #include "chrome/installer/util/helper.h" 22 #include "chrome/installer/util/helper.h"
22 #include "chrome/installer/util/install_util.h" 23 #include "chrome/installer/util/install_util.h"
23 #include "content/public/browser/browser_thread.h" 24 #include "content/public/browser/browser_thread.h"
24 #include "google_update/google_update_idl.h" 25 #include "google_update/google_update_idl.h"
25 #include "grit/generated_resources.h"
26 #include "ui/base/l10n/l10n_util.h" 26 #include "ui/base/l10n/l10n_util.h"
27 #include "ui/base/win/atl_module.h" 27 #include "ui/base/win/atl_module.h"
28 #include "ui/views/widget/widget.h" 28 #include "ui/views/widget/widget.h"
29 29
30 using content::BrowserThread; 30 using content::BrowserThread;
31 31
32 namespace { 32 namespace {
33 33
34 // Check if the currently running instance can be updated by Google Update. 34 // Check if the currently running instance can be updated by Google Update.
35 // Returns GOOGLE_UPDATE_NO_ERROR only if the instance running is a Google 35 // Returns GOOGLE_UPDATE_NO_ERROR only if the instance running is a Google
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 base::MessageLoop* main_loop) { 403 base::MessageLoop* main_loop) {
404 DLOG(ERROR) << "Communication with Google Update failed: " << hr 404 DLOG(ERROR) << "Communication with Google Update failed: " << hr
405 << " error: " << error_code 405 << " error: " << error_code
406 << ", message: " << error_message.c_str(); 406 << ", message: " << error_message.c_str();
407 main_loop->PostTask( 407 main_loop->PostTask(
408 FROM_HERE, 408 FROM_HERE,
409 base::Bind(&GoogleUpdate::ReportResults, this, 409 base::Bind(&GoogleUpdate::ReportResults, this,
410 UPGRADE_ERROR, error_code, error_message)); 410 UPGRADE_ERROR, error_code, error_message));
411 return false; 411 return false;
412 } 412 }
OLDNEW
« no previous file with comments | « chrome/browser/geolocation/geolocation_permission_context.cc ('k') | chrome/browser/gpu/three_d_api_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698