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

Unified Diff: chrome/browser/chromeos/login/wizard_controller.h

Issue 2878056: Put back 53641 - Landing OEM customization CL for Denis... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/login/string_fetcher.cc ('k') | chrome/browser/chromeos/login/wizard_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/wizard_controller.h
===================================================================
--- chrome/browser/chromeos/login/wizard_controller.h (revision 53758)
+++ chrome/browser/chromeos/login/wizard_controller.h (working copy)
@@ -11,6 +11,7 @@
#include "base/gtest_prod_util.h"
#include "base/scoped_ptr.h"
#include "chrome/browser/chromeos/login/screen_observer.h"
+#include "chrome/browser/chromeos/login/string_fetcher.h"
#include "chrome/browser/chromeos/login/view_screen.h"
#include "chrome/browser/chromeos/login/wizard_screen.h"
#include "testing/gtest/include/gtest/gtest_prod.h"
@@ -54,8 +55,11 @@
}
// Returns OOBE completion status.
- static bool IsOobeComplete();
+ static bool IsOobeCompleted();
+ // Returns device registration completion status, i.e. second part of OOBE.
+ static bool IsDeviceRegistered();
+
// Shows the first screen defined by |first_screen_name| or by default
// if the parameter is empty. |screen_bounds| are used to calculate position
// of the wizard screen.
@@ -114,6 +118,9 @@
// Registers OOBE preferences.
static void RegisterPrefs(PrefService* local_state);
+ // Applies partner services customizations.
+ void ApplyPartnerServicesCustomizations();
+
static const char kNetworkScreenName[];
static const char kLoginScreenName[];
static const char kAccountScreenName[];
@@ -165,6 +172,9 @@
// Marks OOBE process as completed.
void MarkOobeCompleted();
+ // Marks device registered. i.e. second part of OOBE is completed.
+ void MarkDeviceRegistered();
+
// Widget we're showing in.
views::Widget* widget_;
@@ -206,6 +216,9 @@
// Partner startup customizations.
scoped_ptr<const chromeos::StartupCustomizationDocument> customization_;
+ // Partner services manifest fetcher.
+ scoped_ptr<StringFetcher> services_manifest_fetcher_;
+
FRIEND_TEST_ALL_PREFIXES(WizardControllerFlowTest, ControlFlowErrorNetwork);
FRIEND_TEST_ALL_PREFIXES(WizardControllerFlowTest, ControlFlowErrorUpdate);
FRIEND_TEST_ALL_PREFIXES(WizardControllerFlowTest,
« no previous file with comments | « chrome/browser/chromeos/login/string_fetcher.cc ('k') | chrome/browser/chromeos/login/wizard_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698