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

Side by Side Diff: chrome/app/android/chrome_main_delegate_android.cc

Issue 1420053005: Move code in components/safe_browsing_db and chrome/browser/s_b/ under the safe_browsing namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@02_components_move
Patch Set: Remove '// namespace safe_browsing' for a small fwd decl block. Created 5 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/app/android/chrome_main_delegate_android.h" 5 #include "chrome/app/android/chrome_main_delegate_android.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/base_paths_android.h" 8 #include "base/base_paths_android.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/path_service.h" 12 #include "base/path_service.h"
13 #include "base/trace_event/trace_event.h" 13 #include "base/trace_event/trace_event.h"
14 #include "chrome/browser/android/chrome_startup_flags.h" 14 #include "chrome/browser/android/chrome_startup_flags.h"
15 #include "chrome/browser/android/metrics/uma_utils.h" 15 #include "chrome/browser/android/metrics/uma_utils.h"
16 #include "chrome/browser/android/metrics/uma_utils.h" 16 #include "chrome/browser/android/metrics/uma_utils.h"
17 #include "chrome/browser/media/android/remote/remote_media_player_manager.h" 17 #include "chrome/browser/media/android/remote/remote_media_player_manager.h"
18 #include "components/policy/core/browser/android/android_combined_policy_provide r.h" 18 #include "components/policy/core/browser/android/android_combined_policy_provide r.h"
19 #include "components/startup_metric_utils/browser/startup_metric_utils.h" 19 #include "components/startup_metric_utils/browser/startup_metric_utils.h"
20 #include "content/browser/media/android/browser_media_player_manager.h" 20 #include "content/browser/media/android/browser_media_player_manager.h"
21 #include "content/public/browser/browser_main_runner.h" 21 #include "content/public/browser/browser_main_runner.h"
22 22
23 #if defined(SAFE_BROWSING_DB_REMOTE) 23 #if defined(SAFE_BROWSING_DB_REMOTE)
24 #include "chrome/browser/safe_browsing/safe_browsing_api_handler.h" 24 #include "chrome/browser/safe_browsing/safe_browsing_api_handler.h"
25 using safe_browsing::SafeBrowsingApiHandler;
25 #endif 26 #endif
26 27
27 namespace { 28 namespace {
28 29
29 content::BrowserMediaPlayerManager* CreateRemoteMediaPlayerManager( 30 content::BrowserMediaPlayerManager* CreateRemoteMediaPlayerManager(
30 content::RenderFrameHost* render_frame_host) { 31 content::RenderFrameHost* render_frame_host) {
31 return new remote_media::RemoteMediaPlayerManager(render_frame_host); 32 return new remote_media::RemoteMediaPlayerManager(render_frame_host);
32 } 33 }
33 34
34 } // namespace 35 } // namespace
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 SafeBrowsingApiHandler::SetInstance(nullptr); 111 SafeBrowsingApiHandler::SetInstance(nullptr);
111 #endif 112 #endif
112 } 113 }
113 114
114 #if defined(SAFE_BROWSING_DB_REMOTE) 115 #if defined(SAFE_BROWSING_DB_REMOTE)
115 SafeBrowsingApiHandler* 116 SafeBrowsingApiHandler*
116 ChromeMainDelegateAndroid::CreateSafeBrowsingApiHandler() { 117 ChromeMainDelegateAndroid::CreateSafeBrowsingApiHandler() {
117 return nullptr; 118 return nullptr;
118 } 119 }
119 #endif 120 #endif
OLDNEW
« no previous file with comments | « chrome/app/android/chrome_main_delegate_android.h ('k') | chrome/browser/android/chrome_application.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698