OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "apps/custom_launcher_page_contents.h" | 5 #include "apps/custom_launcher_page_contents.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "chrome/browser/chrome_notification_types.h" | 10 #include "chrome/browser/chrome_notification_types.h" |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
95 } | 95 } |
96 | 96 |
97 content::ColorChooser* CustomLauncherPageContents::OpenColorChooser( | 97 content::ColorChooser* CustomLauncherPageContents::OpenColorChooser( |
98 content::WebContents* web_contents, | 98 content::WebContents* web_contents, |
99 SkColor initial_color, | 99 SkColor initial_color, |
100 const std::vector<content::ColorSuggestion>& suggestionss) { | 100 const std::vector<content::ColorSuggestion>& suggestionss) { |
101 return app_delegate_->ShowColorChooser(web_contents, initial_color); | 101 return app_delegate_->ShowColorChooser(web_contents, initial_color); |
102 } | 102 } |
103 | 103 |
104 void CustomLauncherPageContents::RunFileChooser( | 104 void CustomLauncherPageContents::RunFileChooser( |
105 content::WebContents* tab, | 105 content::RenderFrameHost* render_frame_host, |
106 const content::FileChooserParams& params) { | 106 const content::FileChooserParams& params) { |
107 app_delegate_->RunFileChooser(tab, params); | 107 app_delegate_->RunFileChooser(render_frame_host, params); |
108 } | 108 } |
109 | 109 |
110 void CustomLauncherPageContents::RequestToLockMouse( | 110 void CustomLauncherPageContents::RequestToLockMouse( |
111 content::WebContents* web_contents, | 111 content::WebContents* web_contents, |
112 bool user_gesture, | 112 bool user_gesture, |
113 bool last_unlocked_by_target) { | 113 bool last_unlocked_by_target) { |
114 DCHECK_EQ(web_contents_.get(), web_contents); | 114 DCHECK_EQ(web_contents_.get(), web_contents); |
115 helper_->RequestToLockMouse(); | 115 helper_->RequestToLockMouse(); |
116 } | 116 } |
117 | 117 |
118 void CustomLauncherPageContents::RequestMediaAccessPermission( | 118 void CustomLauncherPageContents::RequestMediaAccessPermission( |
119 content::WebContents* web_contents, | 119 content::WebContents* web_contents, |
120 const content::MediaStreamRequest& request, | 120 const content::MediaStreamRequest& request, |
121 const content::MediaResponseCallback& callback) { | 121 const content::MediaResponseCallback& callback) { |
122 DCHECK_EQ(web_contents_.get(), web_contents); | 122 DCHECK_EQ(web_contents_.get(), web_contents); |
123 helper_->RequestMediaAccessPermission(request, callback); | 123 helper_->RequestMediaAccessPermission(request, callback); |
124 } | 124 } |
125 | 125 |
126 bool CustomLauncherPageContents::CheckMediaAccessPermission( | 126 bool CustomLauncherPageContents::CheckMediaAccessPermission( |
127 content::WebContents* web_contents, | 127 content::WebContents* web_contents, |
128 const GURL& security_origin, | 128 const GURL& security_origin, |
129 content::MediaStreamType type) { | 129 content::MediaStreamType type) { |
130 DCHECK_EQ(web_contents_.get(), web_contents); | 130 DCHECK_EQ(web_contents_.get(), web_contents); |
131 return helper_->CheckMediaAccessPermission(security_origin, type); | 131 return helper_->CheckMediaAccessPermission(security_origin, type); |
132 } | 132 } |
133 | 133 |
134 } // namespace apps | 134 } // namespace apps |
OLD | NEW |