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

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

Issue 6882038: Move writing information to the lockbox after registering with the DM server. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Fixed nits and rebase issues. Created 9 years, 8 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/enterprise_enrollment_screen.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/background_view.h" 5 #include "chrome/browser/chromeos/login/background_view.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/string16.h" 10 #include "base/string16.h"
(...skipping 478 matching lines...) Expand 10 before | Expand all | Expand 10 after
489 case policy::CloudPolicySubsystem::UNMANAGED: 489 case policy::CloudPolicySubsystem::UNMANAGED:
490 case policy::CloudPolicySubsystem::BAD_GAIA_TOKEN: 490 case policy::CloudPolicySubsystem::BAD_GAIA_TOKEN:
491 case policy::CloudPolicySubsystem::LOCAL_ERROR: 491 case policy::CloudPolicySubsystem::LOCAL_ERROR:
492 status_text = l10n_util::GetStringUTF8( 492 status_text = l10n_util::GetStringUTF8(
493 IDS_LOGIN_MANAGED_BY_STATUS_LOST_CONNECTION); 493 IDS_LOGIN_MANAGED_BY_STATUS_LOST_CONNECTION);
494 break; 494 break;
495 case policy::CloudPolicySubsystem::NETWORK_ERROR: 495 case policy::CloudPolicySubsystem::NETWORK_ERROR:
496 status_text = l10n_util::GetStringUTF8( 496 status_text = l10n_util::GetStringUTF8(
497 IDS_LOGIN_MANAGED_BY_STATUS_NETWORK_ERROR); 497 IDS_LOGIN_MANAGED_BY_STATUS_NETWORK_ERROR);
498 break; 498 break;
499 case policy::CloudPolicySubssytem::TOKEN_FETCHED:
Mattias Nissler (ping if slow) 2011/04/20 15:12:43 You have a typo here :)
499 case policy::CloudPolicySubsystem::SUCCESS: 500 case policy::CloudPolicySubsystem::SUCCESS:
500 break; 501 break;
501 } 502 }
502 } 503 }
503 504
504 SetEnterpriseInfo(policy_connector->GetEnterpriseDomain(), status_text); 505 SetEnterpriseInfo(policy_connector->GetEnterpriseDomain(), status_text);
505 } 506 }
506 507
507 void BackgroundView::SetEnterpriseInfo(const std::string& domain_name, 508 void BackgroundView::SetEnterpriseInfo(const std::string& domain_name,
508 const std::string& status_text) { 509 const std::string& status_text) {
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
549 boot_times_label_->SetText(ASCIIToWide(boot_times_text)); 550 boot_times_label_->SetText(ASCIIToWide(boot_times_text));
550 } 551 }
551 552
552 void BackgroundView::OnPolicyStateChanged( 553 void BackgroundView::OnPolicyStateChanged(
553 policy::CloudPolicySubsystem::PolicySubsystemState state, 554 policy::CloudPolicySubsystem::PolicySubsystemState state,
554 policy::CloudPolicySubsystem::ErrorDetails error_details) { 555 policy::CloudPolicySubsystem::ErrorDetails error_details) {
555 UpdateEnterpriseInfo(); 556 UpdateEnterpriseInfo();
556 } 557 }
557 558
558 } // namespace chromeos 559 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/enterprise_enrollment_screen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698