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

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: Rebase. 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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 "content/public/browser/permission_type.h" 61 #include "content/public/browser/permission_type.h"
62 #include "third_party/WebKit/public/platform/modules/permissions/permission_stat us.mojom.h" 62 #include "third_party/WebKit/public/platform/modules/permissions/permission_stat us.mojom.h"
63 #else 63 #else
64 #include "chrome/browser/permissions/permission_request_manager.h" 64 #include "chrome/browser/permissions/permission_request_manager.h"
65 #include "chrome/browser/ui/website_settings/mock_permission_prompt_factory.h" 65 #include "chrome/browser/ui/permission_bubble/mock_permission_prompt_factory.h"
66 #endif 66 #endif
67 67
68 #if BUILDFLAG(ENABLE_EXTENSIONS) 68 #if BUILDFLAG(ENABLE_EXTENSIONS)
69 #include "extensions/browser/view_type_utils.h" 69 #include "extensions/browser/view_type_utils.h"
70 #endif 70 #endif
71 71
72 using content::MockRenderProcessHost; 72 using content::MockRenderProcessHost;
73 73
74 74
75 // ClosedInfoBarTracker ------------------------------------------------------- 75 // ClosedInfoBarTracker -------------------------------------------------------
(...skipping 1088 matching lines...) Expand 10 before | Expand all | Expand 10 after
1164 // permission status should still be BLOCK. 1164 // permission status should still be BLOCK.
1165 SetGeolocationContentSetting(requesting_frame, requesting_frame, 1165 SetGeolocationContentSetting(requesting_frame, requesting_frame,
1166 CONTENT_SETTING_BLOCK); 1166 CONTENT_SETTING_BLOCK);
1167 MockLocationSettings::SetLocationSettingsDialogStatus(true, GRANTED); 1167 MockLocationSettings::SetLocationSettingsDialogStatus(true, GRANTED);
1168 ASSERT_EQ(blink::mojom::PermissionStatus::DENIED, 1168 ASSERT_EQ(blink::mojom::PermissionStatus::DENIED,
1169 PermissionManager::Get(profile())->GetPermissionStatus( 1169 PermissionManager::Get(profile())->GetPermissionStatus(
1170 content::PermissionType::GEOLOCATION, requesting_frame, 1170 content::PermissionType::GEOLOCATION, requesting_frame,
1171 requesting_frame)); 1171 requesting_frame));
1172 } 1172 }
1173 #endif // defined(OS_ANDROID) 1173 #endif // defined(OS_ANDROID)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698