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

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: Fixed clang errors. 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/cros/network_library_impl_base.cc » ('j') | 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) 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 588 matching lines...) Expand 10 before | Expand all | Expand 10 after
599 profile()->GetPrefs()->FindPreference(prefs::kUseSharedProxies); 599 profile()->GetPrefs()->FindPreference(prefs::kUseSharedProxies);
600 if (use_shared_proxies_pref->IsDefaultValue()) 600 if (use_shared_proxies_pref->IsDefaultValue())
601 profile()->GetPrefs()->SetBoolean(prefs::kUseSharedProxies, false); 601 profile()->GetPrefs()->SetBoolean(prefs::kUseSharedProxies, false);
602 602
603 // This is done in LoginUtils::OnProfileCreated during normal login. 603 // This is done in LoginUtils::OnProfileCreated during normal login.
604 LoginUtils::Get()->InitRlzDelayed(profile()); 604 LoginUtils::Get()->InitRlzDelayed(profile());
605 } 605 }
606 606
607 // Make sure the NetworkConfigurationUpdater is ready so that it pushes ONC 607 // Make sure the NetworkConfigurationUpdater is ready so that it pushes ONC
608 // configuration before login. 608 // configuration before login.
609 policy::BrowserPolicyConnector* connector = 609 g_browser_process->browser_policy_connector()->
610 g_browser_process->browser_policy_connector(); 610 GetNetworkConfigurationUpdater();
611 connector->GetNetworkConfigurationUpdater();
612 611
613 // Make sure that wallpaper boot transition and other delays in OOBE 612 // Make sure that wallpaper boot transition and other delays in OOBE
614 // are disabled for tests by default. 613 // are disabled for tests by default.
615 // Individual tests may enable them if they want. 614 // Individual tests may enable them if they want.
616 if (parsed_command_line().HasSwitch(::switches::kTestType)) 615 if (parsed_command_line().HasSwitch(::switches::kTestType))
617 WizardController::SetZeroDelays(); 616 WizardController::SetZeroDelays();
618 617
619 // Start loading the machine statistics. Note: if we start loading machine 618 // Start loading the machine statistics. Note: if we start loading machine
620 // statistics early in PreEarlyInitialization() then the crossystem tool 619 // statistics early in PreEarlyInitialization() then the crossystem tool
621 // sometimes hangs for unknown reasons, see http://crbug.com/167671. 620 // sometimes hangs for unknown reasons, see http://crbug.com/167671.
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
858 trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0); 857 trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0);
859 trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0); 858 trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0);
860 trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0); 859 trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0);
861 trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0); 860 trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0);
862 trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0); 861 trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0);
863 // This is necessary to start the experiment as a side effect. 862 // This is necessary to start the experiment as a side effect.
864 trial->group(); 863 trial->group();
865 } 864 }
866 865
867 } // namespace chromeos 866 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/cros/network_library_impl_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698