chrome/browser/ui/webui/options/browser_options_handler.cc - Issue 271673006: Eliminate all code related to the AutomaticProfileResetter.

Side by Side Diff: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 271673006: Eliminate all code related to the AutomaticProfileResetter. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixed nit from dbeam@, using new tracked preference deprecation. 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/ui/views/profiles/profile_reset_bubble_view.cc ('k') | chrome/browser/ui/webui/options/reset_profile_settings_handler.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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/ui/webui/options/browser_options_handler.h"	5 #include "chrome/browser/ui/webui/options/browser_options_handler.h"

6	6

7 #include <string>	7 #include <string>

8 #include <vector>	8 #include <vector>

9	9

10 #include "apps/app_window.h"	10 #include "apps/app_window.h"

(...skipping 17 matching lines...) Expand all Loading...
28 #include "chrome/browser/chrome_notification_types.h"	28 #include "chrome/browser/chrome_notification_types.h"

29 #include "chrome/browser/chrome_page_zoom.h"	29 #include "chrome/browser/chrome_page_zoom.h"

30 #include "chrome/browser/custom_home_pages_table_model.h"	30 #include "chrome/browser/custom_home_pages_table_model.h"

31 #include "chrome/browser/download/download_prefs.h"	31 #include "chrome/browser/download/download_prefs.h"

32 #include "chrome/browser/gpu/gpu_mode_manager.h"	32 #include "chrome/browser/gpu/gpu_mode_manager.h"

33 #include "chrome/browser/lifetime/application_lifetime.h"	33 #include "chrome/browser/lifetime/application_lifetime.h"

34 #include "chrome/browser/metrics/metrics_reporting_state.h"	34 #include "chrome/browser/metrics/metrics_reporting_state.h"

35 #include "chrome/browser/prefs/session_startup_pref.h"	35 #include "chrome/browser/prefs/session_startup_pref.h"

36 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"	36 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"

37 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory. h"	37 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory. h"

38 #include "chrome/browser/profile_resetter/automatic_profile_resetter.h"

39 #include "chrome/browser/profile_resetter/automatic_profile_resetter_factory.h"

40 #include "chrome/browser/profiles/profile.h"	38 #include "chrome/browser/profiles/profile.h"

41 #include "chrome/browser/profiles/profile_avatar_icon_util.h"	39 #include "chrome/browser/profiles/profile_avatar_icon_util.h"

42 #include "chrome/browser/profiles/profile_info_cache.h"	40 #include "chrome/browser/profiles/profile_info_cache.h"

43 #include "chrome/browser/profiles/profile_manager.h"	41 #include "chrome/browser/profiles/profile_manager.h"

44 #include "chrome/browser/profiles/profile_metrics.h"	42 #include "chrome/browser/profiles/profile_metrics.h"

45 #include "chrome/browser/profiles/profile_shortcut_manager.h"	43 #include "chrome/browser/profiles/profile_shortcut_manager.h"

46 #include "chrome/browser/profiles/profile_window.h"	44 #include "chrome/browser/profiles/profile_window.h"

47 #include "chrome/browser/profiles/profiles_state.h"	45 #include "chrome/browser/profiles/profiles_state.h"

48 #include "chrome/browser/search/hotword_service.h"	46 #include "chrome/browser/search/hotword_service.h"

49 #include "chrome/browser/search/hotword_service_factory.h"	47 #include "chrome/browser/search/hotword_service_factory.h"

(...skipping 1766 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1816 extension = extensions::GetExtensionOverridingProxy(	1814 extension = extensions::GetExtensionOverridingProxy(

1817 Profile::FromWebUI(web_ui()));	1815 Profile::FromWebUI(web_ui()));

1818 AppendExtensionData("proxy", extension, &extension_controlled);	1816 AppendExtensionData("proxy", extension, &extension_controlled);

1819	1817

1820 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators",	1818 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators",

1821 extension_controlled);	1819 extension_controlled);

1822 #endif // defined(OS_WIN)	1820 #endif // defined(OS_WIN)

1823 }	1821 }

1824	1822

1825 } // namespace options	1823 } // namespace options

OLD	NEW