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

Side by Side Diff: chrome/browser/chromeos/login/version_info_updater.cc

Issue 10827322: Set linux distro to CHROMEOS_RELEASE_DESCRIPTION on ChromeOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with trunk and switch to const-ref string params in version loader callbacks Created 8 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/chromeos/login/version_info_updater.h" 5 #include "chrome/browser/chromeos/login/version_info_updater.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 enterprise_info = l10n_util::GetStringFUTF8( 184 enterprise_info = l10n_util::GetStringFUTF8(
185 IDS_LOGIN_MANAGED_BY_NOTICE, 185 IDS_LOGIN_MANAGED_BY_NOTICE,
186 UTF8ToUTF16(enterprise_domain_text_)); 186 UTF8ToUTF16(enterprise_domain_text_));
187 delegate_->OnEnterpriseInfoUpdated(enterprise_info, reporting_hint); 187 delegate_->OnEnterpriseInfoUpdated(enterprise_info, reporting_hint);
188 } 188 }
189 } 189 }
190 } 190 }
191 } 191 }
192 192
193 void VersionInfoUpdater::OnVersion( 193 void VersionInfoUpdater::OnVersion(
194 VersionLoader::Handle handle, std::string version) { 194 VersionLoader::Handle handle, const std::string& version) {
195 version_text_.swap(version); 195 version_text_ = version;
196 UpdateVersionLabel(); 196 UpdateVersionLabel();
197 } 197 }
198 198
199 void VersionInfoUpdater::OnBootTimesNoop( 199 void VersionInfoUpdater::OnBootTimesNoop(
200 BootTimesLoader::Handle handle, BootTimesLoader::BootTimes boot_times) { 200 BootTimesLoader::Handle handle, BootTimesLoader::BootTimes boot_times) {
201 } 201 }
202 202
203 void VersionInfoUpdater::OnBootTimes( 203 void VersionInfoUpdater::OnBootTimes(
204 BootTimesLoader::Handle handle, BootTimesLoader::BootTimes boot_times) { 204 BootTimesLoader::Handle handle, BootTimesLoader::BootTimes boot_times) {
205 const char* kBootTimesNoChromeExec = 205 const char* kBootTimesNoChromeExec =
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 int type, 240 int type,
241 const content::NotificationSource& source, 241 const content::NotificationSource& source,
242 const content::NotificationDetails& details) { 242 const content::NotificationDetails& details) {
243 if (type == chrome::NOTIFICATION_SYSTEM_SETTING_CHANGED) 243 if (type == chrome::NOTIFICATION_SYSTEM_SETTING_CHANGED)
244 UpdateEnterpriseInfo(); 244 UpdateEnterpriseInfo();
245 else 245 else
246 NOTREACHED(); 246 NOTREACHED();
247 } 247 }
248 248
249 } // namespace chromeos 249 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/version_info_updater.h ('k') | chrome/browser/chromeos/version_loader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698