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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc

Issue 381833002: Move demo mode preference registration. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/network_screen_handler.h ('k') | no next file » | 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) 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/ui/webui/chromeos/login/network_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/network_screen_handler.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/memory/weak_ptr.h" 13 #include "base/memory/weak_ptr.h"
14 #include "base/prefs/pref_registry_simple.h"
15 #include "base/prefs/pref_service.h" 14 #include "base/prefs/pref_service.h"
16 #include "base/strings/stringprintf.h" 15 #include "base/strings/stringprintf.h"
17 #include "base/strings/utf_string_conversions.h" 16 #include "base/strings/utf_string_conversions.h"
18 #include "base/sys_info.h" 17 #include "base/sys_info.h"
19 #include "base/values.h" 18 #include "base/values.h"
20 #include "chrome/browser/browser_process.h" 19 #include "chrome/browser/browser_process.h"
21 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 20 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
22 #include "chrome/browser/chromeos/base/locale_util.h" 21 #include "chrome/browser/chromeos/base/locale_util.h"
23 #include "chrome/browser/chromeos/customization_document.h" 22 #include "chrome/browser/chromeos/customization_document.h"
24 #include "chrome/browser/chromeos/idle_detector.h" 23 #include "chrome/browser/chromeos/idle_detector.h"
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 AddCallback(kJsApiNetworkOnExit, &NetworkScreenHandler::HandleOnExit); 241 AddCallback(kJsApiNetworkOnExit, &NetworkScreenHandler::HandleOnExit);
243 AddCallback(kJsApiNetworkOnLanguageChanged, 242 AddCallback(kJsApiNetworkOnLanguageChanged,
244 &NetworkScreenHandler::HandleOnLanguageChanged); 243 &NetworkScreenHandler::HandleOnLanguageChanged);
245 AddCallback(kJsApiNetworkOnInputMethodChanged, 244 AddCallback(kJsApiNetworkOnInputMethodChanged,
246 &NetworkScreenHandler::HandleOnInputMethodChanged); 245 &NetworkScreenHandler::HandleOnInputMethodChanged);
247 AddCallback(kJsApiNetworkOnTimezoneChanged, 246 AddCallback(kJsApiNetworkOnTimezoneChanged,
248 &NetworkScreenHandler::HandleOnTimezoneChanged); 247 &NetworkScreenHandler::HandleOnTimezoneChanged);
249 } 248 }
250 249
251 250
252 // static
253 void NetworkScreenHandler::RegisterPrefs(PrefRegistrySimple* registry) {
254 registry->RegisterInt64Pref(prefs::kTimeOnOobe, 0);
255 }
256
257 // NetworkScreenHandler, private: ---------------------------------------------- 251 // NetworkScreenHandler, private: ----------------------------------------------
258 252
259 void NetworkScreenHandler::HandleOnExit() { 253 void NetworkScreenHandler::HandleOnExit() {
260 core_oobe_actor_->StopDemoModeDetection(); 254 core_oobe_actor_->StopDemoModeDetection();
261 ClearErrors(); 255 ClearErrors();
262 if (screen_) 256 if (screen_)
263 screen_->OnContinuePressed(); 257 screen_->OnContinuePressed();
264 } 258 }
265 259
266 struct NetworkScreenHandlerOnLanguageChangedCallbackData { 260 struct NetworkScreenHandlerOnLanguageChangedCallbackData {
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 timezone_option->SetString("value", timezone_id); 519 timezone_option->SetString("value", timezone_id);
526 timezone_option->SetString("title", timezone_name); 520 timezone_option->SetString("title", timezone_name);
527 timezone_option->SetBoolean("selected", timezone_id == current_timezone_id); 521 timezone_option->SetBoolean("selected", timezone_id == current_timezone_id);
528 timezone_list->Append(timezone_option.release()); 522 timezone_list->Append(timezone_option.release());
529 } 523 }
530 524
531 return timezone_list.release(); 525 return timezone_list.release();
532 } 526 }
533 527
534 } // namespace chromeos 528 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/network_screen_handler.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698