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

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 1020683003: Make content::PermissionType an enum class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix android compile Created 5 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 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 "content/browser/frame_host/render_frame_host_impl.h" 5 #include "content/browser/frame_host/render_frame_host_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/containers/hash_tables.h" 9 #include "base/containers/hash_tables.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 #include "content/common/inter_process_time_ticks_converter.h" 46 #include "content/common/inter_process_time_ticks_converter.h"
47 #include "content/common/navigation_params.h" 47 #include "content/common/navigation_params.h"
48 #include "content/common/render_frame_setup.mojom.h" 48 #include "content/common/render_frame_setup.mojom.h"
49 #include "content/common/swapped_out_messages.h" 49 #include "content/common/swapped_out_messages.h"
50 #include "content/public/browser/ax_event_notification_details.h" 50 #include "content/public/browser/ax_event_notification_details.h"
51 #include "content/public/browser/browser_accessibility_state.h" 51 #include "content/public/browser/browser_accessibility_state.h"
52 #include "content/public/browser/browser_context.h" 52 #include "content/public/browser/browser_context.h"
53 #include "content/public/browser/browser_plugin_guest_manager.h" 53 #include "content/public/browser/browser_plugin_guest_manager.h"
54 #include "content/public/browser/browser_thread.h" 54 #include "content/public/browser/browser_thread.h"
55 #include "content/public/browser/content_browser_client.h" 55 #include "content/public/browser/content_browser_client.h"
56 #include "content/public/browser/permission_type.h"
56 #include "content/public/browser/render_process_host.h" 57 #include "content/public/browser/render_process_host.h"
57 #include "content/public/browser/render_widget_host_view.h" 58 #include "content/public/browser/render_widget_host_view.h"
58 #include "content/public/browser/stream_handle.h" 59 #include "content/public/browser/stream_handle.h"
59 #include "content/public/browser/user_metrics.h" 60 #include "content/public/browser/user_metrics.h"
60 #include "content/public/common/content_constants.h" 61 #include "content/public/common/content_constants.h"
61 #include "content/public/common/content_switches.h" 62 #include "content/public/common/content_switches.h"
62 #include "content/public/common/url_constants.h" 63 #include "content/public/common/url_constants.h"
63 #include "content/public/common/url_utils.h" 64 #include "content/public/common/url_utils.h"
64 #include "ui/accessibility/ax_tree.h" 65 #include "ui/accessibility/ax_tree.h"
65 #include "url/gurl.h" 66 #include "url/gurl.h"
(...skipping 1875 matching lines...) Expand 10 before | Expand all | Expand 10 after
1941 suspended_nav_params_.reset(); 1942 suspended_nav_params_.reset();
1942 1943
1943 TRACE_EVENT_ASYNC_END0("navigation", 1944 TRACE_EVENT_ASYNC_END0("navigation",
1944 "RenderFrameHostImpl navigation suspended", this); 1945 "RenderFrameHostImpl navigation suspended", this);
1945 navigations_suspended_ = false; 1946 navigations_suspended_ = false;
1946 } 1947 }
1947 1948
1948 void RenderFrameHostImpl::DidUseGeolocationPermission() { 1949 void RenderFrameHostImpl::DidUseGeolocationPermission() {
1949 RenderFrameHost* top_frame = frame_tree_node()->frame_tree()->GetMainFrame(); 1950 RenderFrameHost* top_frame = frame_tree_node()->frame_tree()->GetMainFrame();
1950 GetContentClient()->browser()->RegisterPermissionUsage( 1951 GetContentClient()->browser()->RegisterPermissionUsage(
1951 PERMISSION_GEOLOCATION, 1952 PermissionType::GEOLOCATION,
1952 delegate_->GetAsWebContents(), 1953 delegate_->GetAsWebContents(),
1953 GetLastCommittedURL().GetOrigin(), 1954 GetLastCommittedURL().GetOrigin(),
1954 top_frame->GetLastCommittedURL().GetOrigin()); 1955 top_frame->GetLastCommittedURL().GetOrigin());
1955 } 1956 }
1956 1957
1957 } // namespace content 1958 } // namespace content
OLDNEW
« no previous file with comments | « chrome/browser/content_settings/permission_context_uma_util.cc ('k') | content/browser/media/cdm/browser_cdm_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698