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

Side by Side Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 12676017: Adding policy support to the new network configuration stack. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed remaining comments of Steven. Created 7 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/chrome_browser_main_chromeos.h" 5 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 569 matching lines...) Expand 10 before | Expand all | Expand 10 after
580 profile()->GetPrefs()->FindPreference(prefs::kUseSharedProxies); 580 profile()->GetPrefs()->FindPreference(prefs::kUseSharedProxies);
581 if (use_shared_proxies_pref->IsDefaultValue()) 581 if (use_shared_proxies_pref->IsDefaultValue())
582 profile()->GetPrefs()->SetBoolean(prefs::kUseSharedProxies, false); 582 profile()->GetPrefs()->SetBoolean(prefs::kUseSharedProxies, false);
583 583
584 // This is done in LoginUtils::OnProfileCreated during normal login. 584 // This is done in LoginUtils::OnProfileCreated during normal login.
585 LoginUtils::Get()->InitRlzDelayed(profile()); 585 LoginUtils::Get()->InitRlzDelayed(profile());
586 } 586 }
587 587
588 // Make sure the NetworkConfigurationUpdater is ready so that it pushes ONC 588 // Make sure the NetworkConfigurationUpdater is ready so that it pushes ONC
589 // configuration before login. 589 // configuration before login.
590 policy::BrowserPolicyConnector* connector = 590 g_browser_process->browser_policy_connector()->
591 g_browser_process->browser_policy_connector(); 591 GetNetworkConfigurationUpdater();
592 connector->GetNetworkConfigurationUpdater();
593 592
594 // Make sure that wallpaper boot transition and other delays in OOBE 593 // Make sure that wallpaper boot transition and other delays in OOBE
595 // are disabled for tests by default. 594 // are disabled for tests by default.
596 // Individual tests may enable them if they want. 595 // Individual tests may enable them if they want.
597 if (parsed_command_line().HasSwitch(::switches::kTestType)) 596 if (parsed_command_line().HasSwitch(::switches::kTestType))
598 WizardController::SetZeroDelays(); 597 WizardController::SetZeroDelays();
599 598
600 // Start loading the machine statistics. Note: if we start loading machine 599 // Start loading the machine statistics. Note: if we start loading machine
601 // statistics early in PreEarlyInitialization() then the crossystem tool 600 // statistics early in PreEarlyInitialization() then the crossystem tool
602 // sometimes hangs for unknown reasons, see http://crbug.com/167671. 601 // sometimes hangs for unknown reasons, see http://crbug.com/167671.
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
874 trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0); 873 trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0);
875 trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0); 874 trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0);
876 trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0); 875 trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0);
877 trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0); 876 trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0);
878 trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0); 877 trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0);
879 // This is necessary to start the experiment as a side effect. 878 // This is necessary to start the experiment as a side effect.
880 trial->group(); 879 trial->group();
881 } 880 }
882 881
883 } // namespace chromeos 882 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698