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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
77 user_gesture, | 77 user_gesture, |
78 was_blocked); | 78 was_blocked); |
79 } | 79 } |
80 | 80 |
81 bool CustomLauncherPageContents::IsPopupOrPanel( | 81 bool CustomLauncherPageContents::IsPopupOrPanel( |
82 const content::WebContents* source) const { | 82 const content::WebContents* source) const { |
83 return true; | 83 return true; |
84 } | 84 } |
85 | 85 |
86 bool CustomLauncherPageContents::ShouldSuppressDialogs( | 86 bool CustomLauncherPageContents::ShouldSuppressDialogs( |
87 content::WebContents* source) { | 87 content::WebContents* source, |
| 88 bool before_unload) { |
88 return true; | 89 return true; |
89 } | 90 } |
90 | 91 |
91 bool CustomLauncherPageContents::PreHandleGestureEvent( | 92 bool CustomLauncherPageContents::PreHandleGestureEvent( |
92 content::WebContents* source, | 93 content::WebContents* source, |
93 const blink::WebGestureEvent& event) { | 94 const blink::WebGestureEvent& event) { |
94 return extensions::AppWebContentsHelper::ShouldSuppressGestureEvent(event); | 95 return extensions::AppWebContentsHelper::ShouldSuppressGestureEvent(event); |
95 } | 96 } |
96 | 97 |
97 content::ColorChooser* CustomLauncherPageContents::OpenColorChooser( | 98 content::ColorChooser* CustomLauncherPageContents::OpenColorChooser( |
(...skipping 27 matching lines...) Expand all Loading... |
125 | 126 |
126 bool CustomLauncherPageContents::CheckMediaAccessPermission( | 127 bool CustomLauncherPageContents::CheckMediaAccessPermission( |
127 content::WebContents* web_contents, | 128 content::WebContents* web_contents, |
128 const GURL& security_origin, | 129 const GURL& security_origin, |
129 content::MediaStreamType type) { | 130 content::MediaStreamType type) { |
130 DCHECK_EQ(web_contents_.get(), web_contents); | 131 DCHECK_EQ(web_contents_.get(), web_contents); |
131 return helper_->CheckMediaAccessPermission(security_origin, type); | 132 return helper_->CheckMediaAccessPermission(security_origin, type); |
132 } | 133 } |
133 | 134 |
134 } // namespace apps | 135 } // namespace apps |
OLD | NEW |