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

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: namespace 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 1050 matching lines...) Expand 10 before | Expand all | Expand 10 after
1061 profiles_to_delete[i], ProfileManager::CreateCallback()); 1061 profiles_to_delete[i], ProfileManager::CreateCallback());
1062 } 1062 }
1063 // Clean up stale profiles immediately after browser start. 1063 // Clean up stale profiles immediately after browser start.
1064 BrowserThread::PostTask( 1064 BrowserThread::PostTask(
1065 BrowserThread::FILE, FROM_HERE, 1065 BrowserThread::FILE, FROM_HERE,
1066 base::Bind(&ProfileManager::CleanUpStaleProfiles, profiles_to_delete)); 1066 base::Bind(&ProfileManager::CleanUpStaleProfiles, profiles_to_delete));
1067 } 1067 }
1068 #endif // OS_ANDROID 1068 #endif // OS_ANDROID
1069 1069
1070 #if defined(ENABLE_EXTENSIONS) 1070 #if defined(ENABLE_EXTENSIONS)
1071 InstallJavaScriptDialogExtensionsClient(); 1071 javascript_dialog_extensions_client::InstallClient();
1072 #endif 1072 #endif
1073 1073
1074 #if !defined(OS_IOS) 1074 #if !defined(OS_IOS)
1075 InstallChromeJavaScriptNativeDialogFactory(); 1075 InstallChromeJavaScriptNativeDialogFactory();
1076 #endif 1076 #endif
1077 } 1077 }
1078 1078
1079 void ChromeBrowserMainParts::PostProfileInit() { 1079 void ChromeBrowserMainParts::PostProfileInit() {
1080 TRACE_EVENT0("startup", "ChromeBrowserMainParts::PostProfileInit"); 1080 TRACE_EVENT0("startup", "ChromeBrowserMainParts::PostProfileInit");
1081 LaunchDevToolsHandlerIfNeeded(parsed_command_line()); 1081 LaunchDevToolsHandlerIfNeeded(parsed_command_line());
(...skipping 629 matching lines...) Expand 10 before | Expand all | Expand 10 after
1711 chromeos::CrosSettings::Shutdown(); 1711 chromeos::CrosSettings::Shutdown();
1712 #endif 1712 #endif
1713 #endif 1713 #endif
1714 } 1714 }
1715 1715
1716 // Public members: 1716 // Public members:
1717 1717
1718 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 1718 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
1719 chrome_extra_parts_.push_back(parts); 1719 chrome_extra_parts_.push_back(parts);
1720 } 1720 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698