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

Side by Side Diff: chrome/browser/extensions/chrome_extensions_browser_client.cc

Issue 2137463003: [Extensions] Move Feature channel code into //extensions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Test fix Created 4 years, 5 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/extensions/chrome_extensions_browser_client.h" 5 #include "chrome/browser/extensions/chrome_extensions_browser_client.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
(...skipping 23 matching lines...) Expand all
34 #include "chrome/browser/extensions/updater/chrome_update_client_config.h" 34 #include "chrome/browser/extensions/updater/chrome_update_client_config.h"
35 #include "chrome/browser/external_protocol/external_protocol_handler.h" 35 #include "chrome/browser/external_protocol/external_protocol_handler.h"
36 #include "chrome/browser/profiles/profile.h" 36 #include "chrome/browser/profiles/profile.h"
37 #include "chrome/browser/profiles/profile_manager.h" 37 #include "chrome/browser/profiles/profile_manager.h"
38 #include "chrome/browser/sessions/session_tab_helper.h" 38 #include "chrome/browser/sessions/session_tab_helper.h"
39 #include "chrome/browser/task_management/web_contents_tags.h" 39 #include "chrome/browser/task_management/web_contents_tags.h"
40 #include "chrome/browser/ui/bluetooth/chrome_extension_bluetooth_chooser.h" 40 #include "chrome/browser/ui/bluetooth/chrome_extension_bluetooth_chooser.h"
41 #include "chrome/common/channel_info.h" 41 #include "chrome/common/channel_info.h"
42 #include "chrome/common/chrome_paths.h" 42 #include "chrome/common/chrome_paths.h"
43 #include "chrome/common/chrome_switches.h" 43 #include "chrome/common/chrome_switches.h"
44 #include "chrome/common/extensions/features/feature_channel.h"
45 #include "chrome/common/pref_names.h" 44 #include "chrome/common/pref_names.h"
46 #include "components/net_log/chrome_net_log.h" 45 #include "components/net_log/chrome_net_log.h"
47 #include "components/update_client/update_client.h" 46 #include "components/update_client/update_client.h"
48 #include "components/version_info/version_info.h" 47 #include "components/version_info/version_info.h"
49 #include "content/public/browser/render_process_host.h" 48 #include "content/public/browser/render_process_host.h"
50 #include "content/public/common/content_switches.h" 49 #include "content/public/common/content_switches.h"
51 #include "extensions/browser/api/generated_api_registration.h" 50 #include "extensions/browser/api/generated_api_registration.h"
52 #include "extensions/browser/extension_function_registry.h" 51 #include "extensions/browser/extension_function_registry.h"
53 #include "extensions/browser/extension_prefs.h" 52 #include "extensions/browser/extension_prefs.h"
54 #include "extensions/browser/mojo/service_registration.h" 53 #include "extensions/browser/mojo/service_registration.h"
55 #include "extensions/browser/pref_names.h" 54 #include "extensions/browser/pref_names.h"
56 #include "extensions/browser/url_request_util.h" 55 #include "extensions/browser/url_request_util.h"
56 #include "extensions/common/features/feature_channel.h"
57 57
58 #if defined(OS_CHROMEOS) 58 #if defined(OS_CHROMEOS)
59 #include "chrome/browser/chromeos/profiles/profile_helper.h" 59 #include "chrome/browser/chromeos/profiles/profile_helper.h"
60 #include "chrome/browser/extensions/updater/chromeos_extension_cache_delegate.h" 60 #include "chrome/browser/extensions/updater/chromeos_extension_cache_delegate.h"
61 #include "chrome/browser/extensions/updater/extension_cache_impl.h" 61 #include "chrome/browser/extensions/updater/extension_cache_impl.h"
62 #include "chromeos/chromeos_switches.h" 62 #include "chromeos/chromeos_switches.h"
63 #include "components/user_manager/user_manager.h" 63 #include "components/user_manager/user_manager.h"
64 #else 64 #else
65 #include "extensions/browser/updater/null_extension_cache.h" 65 #include "extensions/browser/updater/null_extension_cache.h"
66 #endif 66 #endif
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 new ChromeExtensionBluetoothChooser(frame, event_handler)); 411 new ChromeExtensionBluetoothChooser(frame, event_handler));
412 } 412 }
413 413
414 bool ChromeExtensionsBrowserClient::IsActivityLoggingEnabled( 414 bool ChromeExtensionsBrowserClient::IsActivityLoggingEnabled(
415 content::BrowserContext* context) { 415 content::BrowserContext* context) {
416 ActivityLog* activity_log = ActivityLog::GetInstance(context); 416 ActivityLog* activity_log = ActivityLog::GetInstance(context);
417 return activity_log && activity_log->is_active(); 417 return activity_log && activity_log->is_active();
418 } 418 }
419 419
420 } // namespace extensions 420 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698