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/test/base/testing_profile.cc

Issue 1066563006: GuestView: Move GuestViewManager extension dependencies to ExtensionsGuestViewManagerDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@extensions_guest_view_message_filter
Patch Set: Fixed NavigateGuest Created 5 years, 8 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 (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/test/base/testing_profile.h" 5 #include "chrome/test/base/testing_profile.h"
6 6
7 #include "base/base_paths.h" 7 #include "base/base_paths.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/message_loop/message_loop_proxy.h" 10 #include "base/message_loop/message_loop_proxy.h"
(...skipping 941 matching lines...) Expand 10 before | Expand all | Expand 10 after
952 extension_service->RegisterContentSettings( 952 extension_service->RegisterContentSettings(
953 host_content_settings_map_.get()); 953 host_content_settings_map_.get());
954 } 954 }
955 #endif 955 #endif
956 } 956 }
957 return host_content_settings_map_.get(); 957 return host_content_settings_map_.get();
958 } 958 }
959 959
960 content::BrowserPluginGuestManager* TestingProfile::GetGuestManager() { 960 content::BrowserPluginGuestManager* TestingProfile::GetGuestManager() {
961 #if defined(ENABLE_EXTENSIONS) 961 #if defined(ENABLE_EXTENSIONS)
962 return extensions::GuestViewManager::FromBrowserContextIfAvailable(this); 962 return extensions::GuestViewManager::FromBrowserContext(this);
963 #else 963 #else
964 return NULL; 964 return NULL;
965 #endif 965 #endif
966 } 966 }
967 967
968 content::PushMessagingService* TestingProfile::GetPushMessagingService() { 968 content::PushMessagingService* TestingProfile::GetPushMessagingService() {
969 return NULL; 969 return NULL;
970 } 970 }
971 971
972 bool TestingProfile::IsSameProfile(Profile *p) { 972 bool TestingProfile::IsSameProfile(Profile *p) {
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
1140 #if defined(ENABLE_EXTENSIONS) 1140 #if defined(ENABLE_EXTENSIONS)
1141 extension_policy_, 1141 extension_policy_,
1142 #endif 1142 #endif
1143 pref_service_.Pass(), 1143 pref_service_.Pass(),
1144 original_profile, 1144 original_profile,
1145 guest_session_, 1145 guest_session_,
1146 supervised_user_id_, 1146 supervised_user_id_,
1147 policy_service_.Pass(), 1147 policy_service_.Pass(),
1148 testing_factories_); 1148 testing_factories_);
1149 } 1149 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/signin/inline_login_ui.cc ('k') | extensions/browser/api/guest_view/guest_view_internal_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698