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

Side by Side Diff: chrome/browser/chrome_browser_main.cc

Issue 336213005: Disable incognito link if parental control is on (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: mmenke's comments addressed Created 6 years, 6 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
« no previous file with comments | « no previous file | chrome/browser/prefs/incognito_mode_prefs.h » ('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/chrome_browser_main.h" 5 #include "chrome/browser/chrome_browser_main.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 #include "chrome/browser/net/chrome_net_log.h" 69 #include "chrome/browser/net/chrome_net_log.h"
70 #include "chrome/browser/net/crl_set_fetcher.h" 70 #include "chrome/browser/net/crl_set_fetcher.h"
71 #include "chrome/browser/notifications/desktop_notification_service.h" 71 #include "chrome/browser/notifications/desktop_notification_service.h"
72 #include "chrome/browser/notifications/desktop_notification_service_factory.h" 72 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
73 #include "chrome/browser/performance_monitor/performance_monitor.h" 73 #include "chrome/browser/performance_monitor/performance_monitor.h"
74 #include "chrome/browser/performance_monitor/startup_timer.h" 74 #include "chrome/browser/performance_monitor/startup_timer.h"
75 #include "chrome/browser/plugins/plugin_prefs.h" 75 #include "chrome/browser/plugins/plugin_prefs.h"
76 #include "chrome/browser/pref_service_flags_storage.h" 76 #include "chrome/browser/pref_service_flags_storage.h"
77 #include "chrome/browser/prefs/chrome_pref_service_factory.h" 77 #include "chrome/browser/prefs/chrome_pref_service_factory.h"
78 #include "chrome/browser/prefs/command_line_pref_store.h" 78 #include "chrome/browser/prefs/command_line_pref_store.h"
79 #include "chrome/browser/prefs/incognito_mode_prefs.h"
79 #include "chrome/browser/prefs/pref_metrics_service.h" 80 #include "chrome/browser/prefs/pref_metrics_service.h"
80 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" 81 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
81 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory. h" 82 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory. h"
82 #include "chrome/browser/process_singleton.h" 83 #include "chrome/browser/process_singleton.h"
83 #include "chrome/browser/profiles/profile.h" 84 #include "chrome/browser/profiles/profile.h"
84 #include "chrome/browser/profiles/profile_manager.h" 85 #include "chrome/browser/profiles/profile_manager.h"
85 #include "chrome/browser/profiles/profiles_state.h" 86 #include "chrome/browser/profiles/profiles_state.h"
86 #include "chrome/browser/shell_integration.h" 87 #include "chrome/browser/shell_integration.h"
87 #include "chrome/browser/translate/translate_service.h" 88 #include "chrome/browser/translate/translate_service.h"
88 #include "chrome/browser/ui/app_list/app_list_service.h" 89 #include "chrome/browser/ui/app_list/app_list_service.h"
(...skipping 1436 matching lines...) Expand 10 before | Expand all | Expand 10 after
1525 TranslateDownloadManager::RequestLanguageList(profile_->GetPrefs()); 1526 TranslateDownloadManager::RequestLanguageList(profile_->GetPrefs());
1526 } 1527 }
1527 1528
1528 run_message_loop_ = true; 1529 run_message_loop_ = true;
1529 } else { 1530 } else {
1530 run_message_loop_ = false; 1531 run_message_loop_ = false;
1531 } 1532 }
1532 browser_creator_.reset(); 1533 browser_creator_.reset();
1533 #endif // !defined(OS_ANDROID) 1534 #endif // !defined(OS_ANDROID)
1534 1535
1536 #if defined(OS_WIN)
1537 IncognitoModePrefs::InitializePlatformParentalControls();
sky 2014/06/19 14:56:15 Can this be moved to chrome_browser_main_win?
guohui 2014/06/19 17:51:41 Done.
1538 #endif // OS_WIN
1539
1535 performance_monitor::PerformanceMonitor::GetInstance()->Initialize(); 1540 performance_monitor::PerformanceMonitor::GetInstance()->Initialize();
1536 1541
1537 PostBrowserStart(); 1542 PostBrowserStart();
1538 1543
1539 chrome_prefs::SchedulePrefHashStoresUpdateCheck(profile_->GetPath()); 1544 chrome_prefs::SchedulePrefHashStoresUpdateCheck(profile_->GetPath());
1540 1545
1541 if (parameters().ui_task) { 1546 if (parameters().ui_task) {
1542 // We end the startup timer here if we have parameters to run, because we 1547 // We end the startup timer here if we have parameters to run, because we
1543 // never start to run the main loop (where we normally stop the timer). 1548 // never start to run the main loop (where we normally stop the timer).
1544 startup_timer_->SignalStartupComplete( 1549 startup_timer_->SignalStartupComplete(
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
1654 chromeos::CrosSettings::Shutdown(); 1659 chromeos::CrosSettings::Shutdown();
1655 #endif 1660 #endif
1656 #endif 1661 #endif
1657 } 1662 }
1658 1663
1659 // Public members: 1664 // Public members:
1660 1665
1661 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 1666 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
1662 chrome_extra_parts_.push_back(parts); 1667 chrome_extra_parts_.push_back(parts);
1663 } 1668 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/prefs/incognito_mode_prefs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698