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

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 Julian's comments. Reuploaded with rebase. 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 576 matching lines...) Expand 10 before | Expand all | Expand 10 after
587 profile()->GetPrefs()->FindPreference(prefs::kUseSharedProxies); 587 profile()->GetPrefs()->FindPreference(prefs::kUseSharedProxies);
588 if (use_shared_proxies_pref->IsDefaultValue()) 588 if (use_shared_proxies_pref->IsDefaultValue())
589 profile()->GetPrefs()->SetBoolean(prefs::kUseSharedProxies, false); 589 profile()->GetPrefs()->SetBoolean(prefs::kUseSharedProxies, false);
590 590
591 // This is done in LoginUtils::OnProfileCreated during normal login. 591 // This is done in LoginUtils::OnProfileCreated during normal login.
592 LoginUtils::Get()->InitRlzDelayed(profile()); 592 LoginUtils::Get()->InitRlzDelayed(profile());
593 } 593 }
594 594
595 // Make sure the NetworkConfigurationUpdater is ready so that it pushes ONC 595 // Make sure the NetworkConfigurationUpdater is ready so that it pushes ONC
596 // configuration before login. 596 // configuration before login.
597 policy::BrowserPolicyConnector* connector = 597 g_browser_process->browser_policy_connector()->
598 g_browser_process->browser_policy_connector(); 598 GetNetworkConfigurationUpdater();
599 connector->GetNetworkConfigurationUpdater();
600 599
601 // Make sure that wallpaper boot transition and other delays in OOBE 600 // Make sure that wallpaper boot transition and other delays in OOBE
602 // are disabled for tests by default. 601 // are disabled for tests by default.
603 // Individual tests may enable them if they want. 602 // Individual tests may enable them if they want.
604 if (parsed_command_line().HasSwitch(::switches::kTestType)) 603 if (parsed_command_line().HasSwitch(::switches::kTestType))
605 WizardController::SetZeroDelays(); 604 WizardController::SetZeroDelays();
606 605
607 // Start loading the machine statistics. Note: if we start loading machine 606 // Start loading the machine statistics. Note: if we start loading machine
608 // statistics early in PreEarlyInitialization() then the crossystem tool 607 // statistics early in PreEarlyInitialization() then the crossystem tool
609 // sometimes hangs for unknown reasons, see http://crbug.com/167671. 608 // sometimes hangs for unknown reasons, see http://crbug.com/167671.
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
835 trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0); 834 trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0);
836 trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0); 835 trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0);
837 trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0); 836 trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0);
838 trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0); 837 trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0);
839 trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0); 838 trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0);
840 // This is necessary to start the experiment as a side effect. 839 // This is necessary to start the experiment as a side effect.
841 trial->group(); 840 trial->group();
842 } 841 }
843 842
844 } // namespace chromeos 843 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698