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

Side by Side Diff: chrome/browser/chromeos/google_update_chromeos.cc

Issue 6028009: Move base/thread.h to base/threading, fix up callers to use the new location.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 11 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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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.h" 5 #include "chrome/browser/google/google_update.h"
6 6
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/task.h" 10 #include "base/task.h"
11 #include "base/thread.h" 11 #include "base/threading/thread.h"
12 #include "base/utf_string_conversions.h" 12 #include "base/utf_string_conversions.h"
13 #include "chrome/browser/browser_thread.h" 13 #include "chrome/browser/browser_thread.h"
14 #include "chrome/browser/chromeos/cros/cros_library.h" 14 #include "chrome/browser/chromeos/cros/cros_library.h"
15 #include "third_party/cros/chromeos_update.h" 15 #include "third_party/cros/chromeos_update.h"
16 #include "views/window/window.h" 16 #include "views/window/window.h"
17 17
18 using views::Window; 18 using views::Window;
19 19
20 //////////////////////////////////////////////////////////////////////////////// 20 ////////////////////////////////////////////////////////////////////////////////
21 // GoogleUpdate, public: 21 // GoogleUpdate, public:
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 105
106 void GoogleUpdate::ReportResults(GoogleUpdateUpgradeResult results, 106 void GoogleUpdate::ReportResults(GoogleUpdateUpgradeResult results,
107 GoogleUpdateErrorCode error_code) { 107 GoogleUpdateErrorCode error_code) {
108 // If we get an error, then error code must not be blank, and vice versa. 108 // If we get an error, then error code must not be blank, and vice versa.
109 DCHECK(results == UPGRADE_ERROR ? error_code != GOOGLE_UPDATE_NO_ERROR : 109 DCHECK(results == UPGRADE_ERROR ? error_code != GOOGLE_UPDATE_NO_ERROR :
110 error_code == GOOGLE_UPDATE_NO_ERROR); 110 error_code == GOOGLE_UPDATE_NO_ERROR);
111 if (listener_) 111 if (listener_)
112 listener_->OnReportResults(results, error_code, version_available_); 112 listener_->OnReportResults(results, error_code, version_available_);
113 } 113 }
114 114
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/dom_ui/system_info_ui.cc ('k') | chrome/browser/chromeos/login/camera.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698