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

Side by Side Diff: chrome/browser/lifetime/application_lifetime.cc

Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 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 | « chrome/browser/io_thread.cc ('k') | chrome/browser/media/media_stream_devices_controller.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) 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/lifetime/application_lifetime.h" 5 #include "chrome/browser/lifetime/application_lifetime.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 23 matching lines...) Expand all
34 #include "chrome/common/chrome_switches.h" 34 #include "chrome/common/chrome_switches.h"
35 #include "chrome/common/pref_names.h" 35 #include "chrome/common/pref_names.h"
36 #include "content/public/browser/browser_shutdown.h" 36 #include "content/public/browser/browser_shutdown.h"
37 #include "content/public/browser/browser_thread.h" 37 #include "content/public/browser/browser_thread.h"
38 #include "content/public/browser/navigation_details.h" 38 #include "content/public/browser/navigation_details.h"
39 #include "content/public/browser/notification_service.h" 39 #include "content/public/browser/notification_service.h"
40 40
41 #if defined(OS_CHROMEOS) 41 #if defined(OS_CHROMEOS)
42 #include "base/sys_info.h" 42 #include "base/sys_info.h"
43 #include "chrome/browser/chromeos/boot_times_loader.h" 43 #include "chrome/browser/chromeos/boot_times_loader.h"
44 #include "chrome/browser/chromeos/login/users/user_manager.h"
45 #include "chromeos/dbus/dbus_thread_manager.h" 44 #include "chromeos/dbus/dbus_thread_manager.h"
46 #include "chromeos/dbus/session_manager_client.h" 45 #include "chromeos/dbus/session_manager_client.h"
47 #include "chromeos/dbus/update_engine_client.h" 46 #include "chromeos/dbus/update_engine_client.h"
48 #endif 47 #endif
49 48
50 #if defined(OS_WIN) 49 #if defined(OS_WIN)
51 #include "base/win/win_util.h" 50 #include "base/win/win_util.h"
52 #endif 51 #endif
53 52
54 namespace chrome { 53 namespace chrome {
(...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
419 // environment is still active. 418 // environment is still active.
420 if (browser->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_NATIVE) 419 if (browser->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_NATIVE)
421 return !ash::Shell::HasInstance(); 420 return !ash::Shell::HasInstance();
422 else if (browser->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) 421 else if (browser->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH)
423 return BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_NATIVE)->empty(); 422 return BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_NATIVE)->empty();
424 #endif 423 #endif
425 return true; 424 return true;
426 } 425 }
427 426
428 } // namespace chrome 427 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/io_thread.cc ('k') | chrome/browser/media/media_stream_devices_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698