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

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

Issue 688853005: Consolidate javascript_dialog_manager.h and javascript_dialog_manager_impl.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 (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 1052 matching lines...) Expand 10 before | Expand all | Expand 10 after
1063 profiles_to_delete[i], ProfileManager::CreateCallback()); 1063 profiles_to_delete[i], ProfileManager::CreateCallback());
1064 } 1064 }
1065 // Clean up stale profiles immediately after browser start. 1065 // Clean up stale profiles immediately after browser start.
1066 BrowserThread::PostTask( 1066 BrowserThread::PostTask(
1067 BrowserThread::FILE, FROM_HERE, 1067 BrowserThread::FILE, FROM_HERE,
1068 base::Bind(&ProfileManager::CleanUpStaleProfiles, profiles_to_delete)); 1068 base::Bind(&ProfileManager::CleanUpStaleProfiles, profiles_to_delete));
1069 } 1069 }
1070 #endif // OS_ANDROID 1070 #endif // OS_ANDROID
1071 1071
1072 #if defined(ENABLE_EXTENSIONS) 1072 #if defined(ENABLE_EXTENSIONS)
1073 InstallJavaScriptDialogExtensionsClient(); 1073 javascript_dialog_extensions_client::InstallClient();
1074 #endif 1074 #endif
1075 1075
1076 #if !defined(OS_IOS) 1076 #if !defined(OS_IOS)
1077 InstallChromeJavaScriptNativeDialogFactory(); 1077 InstallChromeJavaScriptNativeDialogFactory();
1078 #endif 1078 #endif
1079 } 1079 }
1080 1080
1081 void ChromeBrowserMainParts::PostProfileInit() { 1081 void ChromeBrowserMainParts::PostProfileInit() {
1082 TRACE_EVENT0("startup", "ChromeBrowserMainParts::PostProfileInit"); 1082 TRACE_EVENT0("startup", "ChromeBrowserMainParts::PostProfileInit");
1083 LaunchDevToolsHandlerIfNeeded(parsed_command_line()); 1083 LaunchDevToolsHandlerIfNeeded(parsed_command_line());
(...skipping 638 matching lines...) Expand 10 before | Expand all | Expand 10 after
1722 chromeos::CrosSettings::Shutdown(); 1722 chromeos::CrosSettings::Shutdown();
1723 #endif 1723 #endif
1724 #endif 1724 #endif
1725 } 1725 }
1726 1726
1727 // Public members: 1727 // Public members:
1728 1728
1729 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 1729 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
1730 chrome_extra_parts_.push_back(parts); 1730 chrome_extra_parts_.push_back(parts);
1731 } 1731 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698