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

Side by Side Diff: chrome/browser/chromeos/login/wizard_controller.cc

Issue 1351923002: Revert of Turn components/crash into a layered component. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/login/wizard_controller.h" 5 #include "chrome/browser/chromeos/login/wizard_controller.h"
6 6
7 #include <signal.h> 7 #include <signal.h>
8 #include <stdlib.h> 8 #include <stdlib.h>
9 #include <sys/types.h> 9 #include <sys/types.h>
10 10
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 #include "chromeos/dbus/dbus_thread_manager.h" 68 #include "chromeos/dbus/dbus_thread_manager.h"
69 #include "chromeos/dbus/session_manager_client.h" 69 #include "chromeos/dbus/session_manager_client.h"
70 #include "chromeos/geolocation/simple_geolocation_provider.h" 70 #include "chromeos/geolocation/simple_geolocation_provider.h"
71 #include "chromeos/network/network_state.h" 71 #include "chromeos/network/network_state.h"
72 #include "chromeos/network/network_state_handler.h" 72 #include "chromeos/network/network_state_handler.h"
73 #include "chromeos/network/portal_detector/network_portal_detector.h" 73 #include "chromeos/network/portal_detector/network_portal_detector.h"
74 #include "chromeos/settings/cros_settings_names.h" 74 #include "chromeos/settings/cros_settings_names.h"
75 #include "chromeos/settings/cros_settings_provider.h" 75 #include "chromeos/settings/cros_settings_provider.h"
76 #include "chromeos/settings/timezone_settings.h" 76 #include "chromeos/settings/timezone_settings.h"
77 #include "chromeos/timezone/timezone_provider.h" 77 #include "chromeos/timezone/timezone_provider.h"
78 #include "components/crash/content/app/breakpad_linux.h" 78 #include "components/crash/app/breakpad_linux.h"
79 #include "components/pairing/bluetooth_controller_pairing_controller.h" 79 #include "components/pairing/bluetooth_controller_pairing_controller.h"
80 #include "components/pairing/bluetooth_host_pairing_controller.h" 80 #include "components/pairing/bluetooth_host_pairing_controller.h"
81 #include "components/pairing/shark_connection_listener.h" 81 #include "components/pairing/shark_connection_listener.h"
82 #include "components/user_manager/user_manager.h" 82 #include "components/user_manager/user_manager.h"
83 #include "content/public/browser/browser_thread.h" 83 #include "content/public/browser/browser_thread.h"
84 #include "content/public/browser/notification_types.h" 84 #include "content/public/browser/notification_types.h"
85 #include "ui/base/accelerators/accelerator.h" 85 #include "ui/base/accelerators/accelerator.h"
86 86
87 using content::BrowserThread; 87 using content::BrowserThread;
88 88
(...skipping 1228 matching lines...) Expand 10 before | Expand all | Expand 10 after
1317 } 1317 }
1318 1318
1319 EnrollmentScreen* screen = EnrollmentScreen::Get(this); 1319 EnrollmentScreen* screen = EnrollmentScreen::Get(this);
1320 screen->SetParameters(effective_config, shark_controller_.get(), 1320 screen->SetParameters(effective_config, shark_controller_.get(),
1321 remora_controller_.get()); 1321 remora_controller_.get());
1322 SetStatusAreaVisible(true); 1322 SetStatusAreaVisible(true);
1323 SetCurrentScreen(screen); 1323 SetCurrentScreen(screen);
1324 } 1324 }
1325 1325
1326 } // namespace chromeos 1326 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/browser/crash_upload_list_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698