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

Side by Side Diff: chrome/browser/prefs/browser_prefs.cc

Issue 2006513002: [rebase for] Remove the old task manager view (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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/prefs/browser_prefs.h" 5 #include "chrome/browser/prefs/browser_prefs.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/metrics/histogram_macros.h" 9 #include "base/metrics/histogram_macros.h"
10 #include "base/trace_event/trace_event.h" 10 #include "base/trace_event/trace_event.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 #include "chrome/browser/profiles/chrome_version_service.h" 44 #include "chrome/browser/profiles/chrome_version_service.h"
45 #include "chrome/browser/profiles/profile.h" 45 #include "chrome/browser/profiles/profile.h"
46 #include "chrome/browser/profiles/profile_impl.h" 46 #include "chrome/browser/profiles/profile_impl.h"
47 #include "chrome/browser/profiles/profile_info_cache.h" 47 #include "chrome/browser/profiles/profile_info_cache.h"
48 #include "chrome/browser/profiles/profiles_state.h" 48 #include "chrome/browser/profiles/profiles_state.h"
49 #include "chrome/browser/push_messaging/background_budget_service.h" 49 #include "chrome/browser/push_messaging/background_budget_service.h"
50 #include "chrome/browser/push_messaging/push_messaging_app_identifier.h" 50 #include "chrome/browser/push_messaging/push_messaging_app_identifier.h"
51 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h" 51 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h"
52 #include "chrome/browser/search/search.h" 52 #include "chrome/browser/search/search.h"
53 #include "chrome/browser/signin/signin_manager_factory.h" 53 #include "chrome/browser/signin/signin_manager_factory.h"
54 #include "chrome/browser/task_manager/task_manager.h" 54 #include "chrome/browser/task_management/task_manager_interface.h"
55 #include "chrome/browser/tracing/chrome_tracing_delegate.h" 55 #include "chrome/browser/tracing/chrome_tracing_delegate.h"
56 #include "chrome/browser/ui/app_list/app_list_prefs.h" 56 #include "chrome/browser/ui/app_list/app_list_prefs.h"
57 #include "chrome/browser/ui/app_list/app_list_service.h" 57 #include "chrome/browser/ui/app_list/app_list_service.h"
58 #include "chrome/browser/ui/browser_ui_prefs.h" 58 #include "chrome/browser/ui/browser_ui_prefs.h"
59 #include "chrome/browser/ui/navigation_correction_tab_observer.h" 59 #include "chrome/browser/ui/navigation_correction_tab_observer.h"
60 #include "chrome/browser/ui/network_profile_bubble.h" 60 #include "chrome/browser/ui/network_profile_bubble.h"
61 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" 61 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
62 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" 62 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
63 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" 63 #include "chrome/browser/ui/tabs/pinned_tab_codec.h"
64 #include "chrome/browser/ui/webui/flags_ui.h" 64 #include "chrome/browser/ui/webui/flags_ui.h"
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 327
328 #if defined(ENABLE_PLUGINS) 328 #if defined(ENABLE_PLUGINS)
329 PluginFinder::RegisterPrefs(registry); 329 PluginFinder::RegisterPrefs(registry);
330 #endif 330 #endif
331 331
332 #if defined(ENABLE_PLUGIN_INSTALLATION) 332 #if defined(ENABLE_PLUGIN_INSTALLATION)
333 PluginsResourceService::RegisterPrefs(registry); 333 PluginsResourceService::RegisterPrefs(registry);
334 #endif 334 #endif
335 335
336 #if defined(ENABLE_TASK_MANAGER) 336 #if defined(ENABLE_TASK_MANAGER)
337 TaskManager::RegisterPrefs(registry); 337 task_management::TaskManagerInterface::RegisterPrefs(registry);
338 #endif // defined(ENABLE_TASK_MANAGER) 338 #endif // defined(ENABLE_TASK_MANAGER)
339 339
340 #if BUILDFLAG(ENABLE_BACKGROUND) 340 #if BUILDFLAG(ENABLE_BACKGROUND)
341 BackgroundModeManager::RegisterPrefs(registry); 341 BackgroundModeManager::RegisterPrefs(registry);
342 #endif 342 #endif
343 343
344 #if !defined(OS_ANDROID) 344 #if !defined(OS_ANDROID)
345 ChromeTracingDelegate::RegisterPrefs(registry); 345 ChromeTracingDelegate::RegisterPrefs(registry);
346 RegisterBrowserPrefs(registry); 346 RegisterBrowserPrefs(registry);
347 StartupBrowserCreator::RegisterLocalStatePrefs(registry); 347 StartupBrowserCreator::RegisterLocalStatePrefs(registry);
(...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
689 metrics_service 689 metrics_service
690 ? base::Time::FromTimeT(metrics_service->GetInstallDate()) 690 ? base::Time::FromTimeT(metrics_service->GetInstallDate())
691 : base::Time::Now(); 691 : base::Time::Now();
692 profile_prefs->SetInt64(prefs::kDefaultBrowserLastDeclined, 692 profile_prefs->SetInt64(prefs::kDefaultBrowserLastDeclined,
693 install_time.ToInternalValue()); 693 install_time.ToInternalValue());
694 } 694 }
695 profile_prefs->ClearPref(kCheckDefaultBrowser); 695 profile_prefs->ClearPref(kCheckDefaultBrowser);
696 } 696 }
697 697
698 } // namespace chrome 698 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/policy/policy_browsertest.cc ('k') | chrome/browser/task_management/task_manager_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698