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

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

Issue 3026006: Fixed problems with initial locale change freezing Chrome OS on the device.... (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
Index: chrome/browser/chromeos/login/wizard_controller.h
===================================================================
--- chrome/browser/chromeos/login/wizard_controller.h (revision 52817)
+++ chrome/browser/chromeos/login/wizard_controller.h (working copy)
@@ -10,6 +10,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"
@@ -104,6 +105,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[];
@@ -196,6 +200,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,

Powered by Google App Engine
This is Rietveld 408576698