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

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

Issue 238433003: Provide Shill IP Address to myIpAddress() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Non proxy specific implementation Created 6 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/ash_switches.h" 10 #include "ash/ash_switches.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 #include "chrome/browser/chromeos/language_preferences.h" 42 #include "chrome/browser/chromeos/language_preferences.h"
43 #include "chrome/browser/chromeos/login/authenticator.h" 43 #include "chrome/browser/chromeos/login/authenticator.h"
44 #include "chrome/browser/chromeos/login/login_utils.h" 44 #include "chrome/browser/chromeos/login/login_utils.h"
45 #include "chrome/browser/chromeos/login/login_wizard.h" 45 #include "chrome/browser/chromeos/login/login_wizard.h"
46 #include "chrome/browser/chromeos/login/screen_locker.h" 46 #include "chrome/browser/chromeos/login/screen_locker.h"
47 #include "chrome/browser/chromeos/login/startup_utils.h" 47 #include "chrome/browser/chromeos/login/startup_utils.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/oom_priority_manager.h" 51 #include "chrome/browser/chromeos/memory/oom_priority_manager.h"
52 #include "chrome/browser/chromeos/net/chrome_network_watcher.h"
52 #include "chrome/browser/chromeos/net/network_portal_detector.h" 53 #include "chrome/browser/chromeos/net/network_portal_detector.h"
53 #include "chrome/browser/chromeos/options/cert_library.h" 54 #include "chrome/browser/chromeos/options/cert_library.h"
54 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 55 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
55 #include "chrome/browser/chromeos/power/idle_action_warning_observer.h" 56 #include "chrome/browser/chromeos/power/idle_action_warning_observer.h"
56 #include "chrome/browser/chromeos/power/peripheral_battery_observer.h" 57 #include "chrome/browser/chromeos/power/peripheral_battery_observer.h"
57 #include "chrome/browser/chromeos/power/power_button_observer.h" 58 #include "chrome/browser/chromeos/power/power_button_observer.h"
58 #include "chrome/browser/chromeos/power/power_data_collector.h" 59 #include "chrome/browser/chromeos/power/power_data_collector.h"
59 #include "chrome/browser/chromeos/power/power_prefs.h" 60 #include "chrome/browser/chromeos/power/power_prefs.h"
60 #include "chrome/browser/chromeos/profiles/profile_helper.h" 61 #include "chrome/browser/chromeos/profiles/profile_helper.h"
61 #include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h " 62 #include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h "
(...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after
471 g_browser_process->profile_manager(); 472 g_browser_process->profile_manager();
472 473
473 // ProfileHelper has to be initialized after UserManager instance is created. 474 // ProfileHelper has to be initialized after UserManager instance is created.
474 g_browser_process->platform_part()->profile_helper()->Initialize(); 475 g_browser_process->platform_part()->profile_helper()->Initialize();
475 476
476 // TODO(abarth): Should this move to InitializeNetworkOptions()? 477 // TODO(abarth): Should this move to InitializeNetworkOptions()?
477 // Allow access to file:// on ChromeOS for tests. 478 // Allow access to file:// on ChromeOS for tests.
478 if (parsed_command_line().HasSwitch(::switches::kAllowFileAccess)) 479 if (parsed_command_line().HasSwitch(::switches::kAllowFileAccess))
479 ChromeNetworkDelegate::AllowAccessToAllFiles(); 480 ChromeNetworkDelegate::AllowAccessToAllFiles();
480 481
482 chrome_network_watcher_.reset(new ChromeNetworkWatcher);
483
481 // There are two use cases for kLoginUser: 484 // There are two use cases for kLoginUser:
482 // 1) if passed in tandem with kLoginPassword, to drive a "StubLogin" 485 // 1) if passed in tandem with kLoginPassword, to drive a "StubLogin"
483 // 2) if passed alone, to signal that the indicated user has already 486 // 2) if passed alone, to signal that the indicated user has already
484 // logged in and we should behave accordingly. 487 // logged in and we should behave accordingly.
485 // This handles case 2. 488 // This handles case 2.
486 bool immediate_login = 489 bool immediate_login =
487 parsed_command_line().HasSwitch(switches::kLoginUser) && 490 parsed_command_line().HasSwitch(switches::kLoginUser) &&
488 !parsed_command_line().HasSwitch(switches::kLoginPassword); 491 !parsed_command_line().HasSwitch(switches::kLoginPassword);
489 if (immediate_login){ 492 if (immediate_login){
490 // Redirects Chrome logging to the user data dir. 493 // Redirects Chrome logging to the user data dir.
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
758 // depend on. 761 // depend on.
759 data_promo_notification_.reset(); 762 data_promo_notification_.reset();
760 763
761 // Tell DeviceSettingsService to stop talking to session_manager. Do not 764 // Tell DeviceSettingsService to stop talking to session_manager. Do not
762 // shutdown DeviceSettingsService yet, it might still be accessed by 765 // shutdown DeviceSettingsService yet, it might still be accessed by
763 // BrowserPolicyConnector (owned by g_browser_process). 766 // BrowserPolicyConnector (owned by g_browser_process).
764 DeviceSettingsService::Get()->UnsetSessionManager(); 767 DeviceSettingsService::Get()->UnsetSessionManager();
765 768
766 // We should remove observers attached to D-Bus clients before 769 // We should remove observers attached to D-Bus clients before
767 // DBusThreadManager is shut down. 770 // DBusThreadManager is shut down.
771 chrome_network_watcher_.reset();
768 extension_system_event_observer_.reset(); 772 extension_system_event_observer_.reset();
769 retail_mode_power_save_blocker_.reset(); 773 retail_mode_power_save_blocker_.reset();
770 peripheral_battery_observer_.reset(); 774 peripheral_battery_observer_.reset();
771 power_prefs_.reset(); 775 power_prefs_.reset();
772 776
773 // Let the ScreenLocker unregister itself from SessionManagerClient before 777 // Let the ScreenLocker unregister itself from SessionManagerClient before
774 // DBusThreadManager is shut down. 778 // DBusThreadManager is shut down.
775 if (!KioskModeSettings::Get()->IsKioskModeEnabled()) 779 if (!KioskModeSettings::Get()->IsKioskModeEnabled())
776 ScreenLocker::ShutDownClass(); 780 ScreenLocker::ShutDownClass();
777 781
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
837 // Destroy DBus services immediately after threads are stopped. 841 // Destroy DBus services immediately after threads are stopped.
838 dbus_services_.reset(); 842 dbus_services_.reset();
839 843
840 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 844 ChromeBrowserMainPartsLinux::PostDestroyThreads();
841 845
842 // Destroy DeviceSettingsService after g_browser_process. 846 // Destroy DeviceSettingsService after g_browser_process.
843 DeviceSettingsService::Shutdown(); 847 DeviceSettingsService::Shutdown();
844 } 848 }
845 849
846 } // namespace chromeos 850 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698