chrome/browser/chromeos/app_mode/app_session.cc - Issue 1658793002: Update chrome for new prefs location.

Side by Side Diff: chrome/browser/chromeos/app_mode/app_session.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 10 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

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 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/app_mode/app_session.h"	5 #include "chrome/browser/chromeos/app_mode/app_session.h"

6	6

7 #include <errno.h>	7 #include <errno.h>

8 #include <signal.h>	8 #include <signal.h>

9	9

10 #include "base/bind.h"	10 #include "base/bind.h"

11 #include "base/lazy_instance.h"	11 #include "base/lazy_instance.h"

12 #include "base/macros.h"	12 #include "base/macros.h"

13 #include "base/message_loop/message_loop.h"	13 #include "base/message_loop/message_loop.h"

14 #include "base/prefs/pref_service.h"

15 #include "chrome/browser/browser_process.h"	14 #include "chrome/browser/browser_process.h"

16 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"	15 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"

17 #include "chrome/browser/chromeos/app_mode/kiosk_app_update_service.h"	16 #include "chrome/browser/chromeos/app_mode/kiosk_app_update_service.h"

18 #include "chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification .h"	17 #include "chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification .h"

19 #include "chrome/browser/chromeos/app_mode/kiosk_session_plugin_handler.h"	18 #include "chrome/browser/chromeos/app_mode/kiosk_session_plugin_handler.h"

20 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h"	19 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h"

21 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"	20 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"

22 #include "chrome/browser/lifetime/application_lifetime.h"	21 #include "chrome/browser/lifetime/application_lifetime.h"

23 #include "chrome/browser/profiles/profile.h"	22 #include "chrome/browser/profiles/profile.h"

24 #include "chrome/browser/ui/browser.h"	23 #include "chrome/browser/ui/browser.h"

25 #include "chrome/browser/ui/browser_list.h"	24 #include "chrome/browser/ui/browser_list.h"

26 #include "chrome/browser/ui/browser_list_observer.h"	25 #include "chrome/browser/ui/browser_list_observer.h"

27 #include "chrome/browser/ui/browser_window.h"	26 #include "chrome/browser/ui/browser_window.h"

28 #include "chrome/browser/ui/tabs/tab_strip_model.h"	27 #include "chrome/browser/ui/tabs/tab_strip_model.h"

29 #include "chrome/common/pref_names.h"	28 #include "chrome/common/pref_names.h"

30 #include "chromeos/dbus/dbus_thread_manager.h"	29 #include "chromeos/dbus/dbus_thread_manager.h"

31 #include "chromeos/dbus/power_manager_client.h"	30 #include "chromeos/dbus/power_manager_client.h"

32 #include "chromeos/network/network_state.h"	31 #include "chromeos/network/network_state.h"

33 #include "chromeos/network/network_state_handler.h"	32 #include "chromeos/network/network_state_handler.h"

	33 #include "components/prefs/pref_service.h"

34 #include "components/user_manager/user_manager.h"	34 #include "components/user_manager/user_manager.h"

35 #include "content/public/browser/browser_child_process_host_iterator.h"	35 #include "content/public/browser/browser_child_process_host_iterator.h"

36 #include "content/public/browser/browser_thread.h"	36 #include "content/public/browser/browser_thread.h"

37 #include "content/public/browser/child_process_data.h"	37 #include "content/public/browser/child_process_data.h"

38 #include "content/public/browser/plugin_service.h"	38 #include "content/public/browser/plugin_service.h"

39 #include "content/public/browser/web_contents.h"	39 #include "content/public/browser/web_contents.h"

40 #include "content/public/common/process_type.h"	40 #include "content/public/common/process_type.h"

41 #include "content/public/common/webplugininfo.h"	41 #include "content/public/common/webplugininfo.h"

42 #include "extensions/browser/app_window/app_window.h"	42 #include "extensions/browser/app_window/app_window.h"

43 #include "extensions/browser/app_window/app_window_registry.h"	43 #include "extensions/browser/app_window/app_window_registry.h"

(...skipping 216 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
260 return;	260 return;

261 is_shutting_down_ = true;	261 is_shutting_down_ = true;

262	262

263 LOG(ERROR) << "Plugin hung detected. Dump and reboot.";	263 LOG(ERROR) << "Plugin hung detected. Dump and reboot.";

264 content::BrowserThread::PostTask(	264 content::BrowserThread::PostTask(

265 content::BrowserThread::IO, FROM_HERE,	265 content::BrowserThread::IO, FROM_HERE,

266 base::Bind(&DumpPluginProcessOnIOThread, hung_plugins));	266 base::Bind(&DumpPluginProcessOnIOThread, hung_plugins));

267 }	267 }

268	268

269 } // namespace chromeos	269 } // namespace chromeos

OLD	NEW