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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 13454006: Moving ManagedNetworkConfigurationHandler to chromeos/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cleaned up parsing of NetworkUIData. 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/certificate_pattern.h » ('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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 #include "chrome/browser/chromeos/login/login_utils.h" 45 #include "chrome/browser/chromeos/login/login_utils.h"
46 #include "chrome/browser/chromeos/login/login_wizard.h" 46 #include "chrome/browser/chromeos/login/login_wizard.h"
47 #include "chrome/browser/chromeos/login/screen_locker.h" 47 #include "chrome/browser/chromeos/login/screen_locker.h"
48 #include "chrome/browser/chromeos/login/user_manager.h" 48 #include "chrome/browser/chromeos/login/user_manager.h"
49 #include "chrome/browser/chromeos/login/wallpaper_manager.h" 49 #include "chrome/browser/chromeos/login/wallpaper_manager.h"
50 #include "chrome/browser/chromeos/login/wizard_controller.h" 50 #include "chrome/browser/chromeos/login/wizard_controller.h"
51 #include "chrome/browser/chromeos/memory/low_memory_observer.h" 51 #include "chrome/browser/chromeos/memory/low_memory_observer.h"
52 #include "chrome/browser/chromeos/memory/oom_priority_manager.h" 52 #include "chrome/browser/chromeos/memory/oom_priority_manager.h"
53 #include "chrome/browser/chromeos/net/connectivity_state_helper.h" 53 #include "chrome/browser/chromeos/net/connectivity_state_helper.h"
54 #include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h" 54 #include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h"
55 #include "chrome/browser/chromeos/net/managed_network_configuration_handler.h"
56 #include "chrome/browser/chromeos/net/network_change_notifier_network_library.h" 55 #include "chrome/browser/chromeos/net/network_change_notifier_network_library.h"
57 #include "chrome/browser/chromeos/net/network_portal_detector.h" 56 #include "chrome/browser/chromeos/net/network_portal_detector.h"
58 #include "chrome/browser/chromeos/power/brightness_observer.h" 57 #include "chrome/browser/chromeos/power/brightness_observer.h"
59 #include "chrome/browser/chromeos/power/idle_action_warning_observer.h" 58 #include "chrome/browser/chromeos/power/idle_action_warning_observer.h"
60 #include "chrome/browser/chromeos/power/power_button_observer.h" 59 #include "chrome/browser/chromeos/power/power_button_observer.h"
61 #include "chrome/browser/chromeos/power/resume_observer.h" 60 #include "chrome/browser/chromeos/power/resume_observer.h"
62 #include "chrome/browser/chromeos/power/screen_lock_observer.h" 61 #include "chrome/browser/chromeos/power/screen_lock_observer.h"
63 #include "chrome/browser/chromeos/power/suspend_observer.h" 62 #include "chrome/browser/chromeos/power/suspend_observer.h"
64 #include "chrome/browser/chromeos/power/user_activity_notifier.h" 63 #include "chrome/browser/chromeos/power/user_activity_notifier.h"
65 #include "chrome/browser/chromeos/power/video_activity_notifier.h" 64 #include "chrome/browser/chromeos/power/video_activity_notifier.h"
(...skipping 20 matching lines...) Expand all
86 #include "chrome/common/logging_chrome.h" 85 #include "chrome/common/logging_chrome.h"
87 #include "chrome/common/pref_names.h" 86 #include "chrome/common/pref_names.h"
88 #include "chromeos/chromeos_switches.h" 87 #include "chromeos/chromeos_switches.h"
89 #include "chromeos/cryptohome/async_method_caller.h" 88 #include "chromeos/cryptohome/async_method_caller.h"
90 #include "chromeos/dbus/dbus_thread_manager.h" 89 #include "chromeos/dbus/dbus_thread_manager.h"
91 #include "chromeos/dbus/power_manager_client.h" 90 #include "chromeos/dbus/power_manager_client.h"
92 #include "chromeos/dbus/session_manager_client.h" 91 #include "chromeos/dbus/session_manager_client.h"
93 #include "chromeos/disks/disk_mount_manager.h" 92 #include "chromeos/disks/disk_mount_manager.h"
94 #include "chromeos/ime/xkeyboard.h" 93 #include "chromeos/ime/xkeyboard.h"
95 #include "chromeos/network/geolocation_handler.h" 94 #include "chromeos/network/geolocation_handler.h"
95 #include "chromeos/network/managed_network_configuration_handler.h"
96 #include "chromeos/network/network_change_notifier_chromeos.h" 96 #include "chromeos/network/network_change_notifier_chromeos.h"
97 #include "chromeos/network/network_change_notifier_factory_chromeos.h" 97 #include "chromeos/network/network_change_notifier_factory_chromeos.h"
98 #include "chromeos/network/network_configuration_handler.h" 98 #include "chromeos/network/network_configuration_handler.h"
99 #include "chromeos/network/network_event_log.h" 99 #include "chromeos/network/network_event_log.h"
100 #include "chromeos/network/network_state_handler.h" 100 #include "chromeos/network/network_state_handler.h"
101 #include "content/public/browser/browser_thread.h" 101 #include "content/public/browser/browser_thread.h"
102 #include "content/public/browser/notification_service.h" 102 #include "content/public/browser/notification_service.h"
103 #include "content/public/browser/power_save_blocker.h" 103 #include "content/public/browser/power_save_blocker.h"
104 #include "content/public/common/main_function_params.h" 104 #include "content/public/common/main_function_params.h"
105 #include "grit/platform_locale_settings.h" 105 #include "grit/platform_locale_settings.h"
(...skipping 768 matching lines...) Expand 10 before | Expand all | Expand 10 after
874 trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0); 874 trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0);
875 trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0); 875 trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0);
876 trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0); 876 trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0);
877 trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0); 877 trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0);
878 trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0); 878 trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0);
879 // This is necessary to start the experiment as a side effect. 879 // This is necessary to start the experiment as a side effect.
880 trial->group(); 880 trial->group();
881 } 881 }
882 882
883 } // namespace chromeos 883 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/cros/certificate_pattern.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698