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

Side by Side Diff: chrome/browser/geolocation/geolocation_permission_context_unittest.cc

Issue 2748443005: Rename website_settings UI folders to permission_bubble. (Closed)
Patch Set: Created 3 years, 9 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/browser/geolocation/geolocation_permission_context.h" 5 #include "chrome/browser/geolocation/geolocation_permission_context.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 54
55 #if defined(OS_ANDROID) 55 #if defined(OS_ANDROID)
56 #include "chrome/browser/android/mock_location_settings.h" 56 #include "chrome/browser/android/mock_location_settings.h"
57 #include "chrome/browser/android/search_geolocation/search_geolocation_service.h " 57 #include "chrome/browser/android/search_geolocation/search_geolocation_service.h "
58 #include "chrome/browser/geolocation/geolocation_permission_context_android.h" 58 #include "chrome/browser/geolocation/geolocation_permission_context_android.h"
59 #include "components/location/android/location_settings_dialog_outcome.h" 59 #include "components/location/android/location_settings_dialog_outcome.h"
60 #include "components/prefs/pref_service.h" 60 #include "components/prefs/pref_service.h"
61 #include "third_party/WebKit/public/platform/modules/permissions/permission_stat us.mojom.h" 61 #include "third_party/WebKit/public/platform/modules/permissions/permission_stat us.mojom.h"
62 #else 62 #else
63 #include "chrome/browser/permissions/permission_request_manager.h" 63 #include "chrome/browser/permissions/permission_request_manager.h"
64 #include "chrome/browser/ui/website_settings/mock_permission_prompt_factory.h" 64 #include "chrome/browser/ui/permission_bubble/mock_permission_prompt_factory.h"
65 #endif 65 #endif
66 66
67 #if BUILDFLAG(ENABLE_EXTENSIONS) 67 #if BUILDFLAG(ENABLE_EXTENSIONS)
68 #include "extensions/browser/view_type_utils.h" 68 #include "extensions/browser/view_type_utils.h"
69 #endif 69 #endif
70 70
71 using content::MockRenderProcessHost; 71 using content::MockRenderProcessHost;
72 72
73 73
74 // ClosedInfoBarTracker ------------------------------------------------------- 74 // ClosedInfoBarTracker -------------------------------------------------------
(...skipping 930 matching lines...) Expand 10 before | Expand all | Expand 10 after
1005 1005
1006 // Changing the setting to BLOCK should flow through to incognito. 1006 // Changing the setting to BLOCK should flow through to incognito.
1007 geo_service->SetDSEGeolocationSetting(false); 1007 geo_service->SetDSEGeolocationSetting(false);
1008 ASSERT_EQ(CONTENT_SETTING_BLOCK, 1008 ASSERT_EQ(CONTENT_SETTING_BLOCK,
1009 PermissionManager::Get(otr_profile) 1009 PermissionManager::Get(otr_profile)
1010 ->GetPermissionStatus(CONTENT_SETTINGS_TYPE_GEOLOCATION, 1010 ->GetPermissionStatus(CONTENT_SETTINGS_TYPE_GEOLOCATION,
1011 requesting_frame, requesting_frame) 1011 requesting_frame, requesting_frame)
1012 .content_setting); 1012 .content_setting);
1013 } 1013 }
1014 #endif // defined(OS_ANDROID) 1014 #endif // defined(OS_ANDROID)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698