OLD | NEW |
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/android/chrome_web_contents_delegate_android.h" | 5 #include "chrome/browser/android/chrome_web_contents_delegate_android.h" |
6 | 6 |
7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
8 #include "base/android/jni_string.h" | 8 #include "base/android/jni_string.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "chrome/browser/chrome_notification_types.h" | 10 #include "chrome/browser/chrome_notification_types.h" |
(...skipping 13 matching lines...) Expand all Loading... |
24 #include "components/app_modal/javascript_dialog_manager.h" | 24 #include "components/app_modal/javascript_dialog_manager.h" |
25 #include "content/public/browser/notification_details.h" | 25 #include "content/public/browser/notification_details.h" |
26 #include "content/public/browser/notification_service.h" | 26 #include "content/public/browser/notification_service.h" |
27 #include "content/public/browser/notification_source.h" | 27 #include "content/public/browser/notification_source.h" |
28 #include "content/public/browser/render_process_host.h" | 28 #include "content/public/browser/render_process_host.h" |
29 #include "content/public/browser/render_view_host.h" | 29 #include "content/public/browser/render_view_host.h" |
30 #include "content/public/browser/web_contents.h" | 30 #include "content/public/browser/web_contents.h" |
31 #include "content/public/common/file_chooser_params.h" | 31 #include "content/public/common/file_chooser_params.h" |
32 #include "jni/ChromeWebContentsDelegateAndroid_jni.h" | 32 #include "jni/ChromeWebContentsDelegateAndroid_jni.h" |
33 #include "third_party/WebKit/public/web/WebWindowFeatures.h" | 33 #include "third_party/WebKit/public/web/WebWindowFeatures.h" |
34 #include "ui/gfx/rect.h" | 34 #include "ui/gfx/geometry/rect.h" |
35 #include "ui/gfx/rect_f.h" | 35 #include "ui/gfx/geometry/rect_f.h" |
36 | 36 |
37 #if defined(ENABLE_PLUGINS) | 37 #if defined(ENABLE_PLUGINS) |
38 #include "chrome/browser/pepper_broker_infobar_delegate.h" | 38 #include "chrome/browser/pepper_broker_infobar_delegate.h" |
39 #endif | 39 #endif |
40 | 40 |
41 using base::android::AttachCurrentThread; | 41 using base::android::AttachCurrentThread; |
42 using base::android::ScopedJavaLocalRef; | 42 using base::android::ScopedJavaLocalRef; |
43 using content::FileChooserParams; | 43 using content::FileChooserParams; |
44 using content::WebContents; | 44 using content::WebContents; |
45 | 45 |
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
333 } | 333 } |
334 | 334 |
335 if (was_blocked) | 335 if (was_blocked) |
336 *was_blocked = !handled; | 336 *was_blocked = !handled; |
337 if (!handled) | 337 if (!handled) |
338 delete new_contents; | 338 delete new_contents; |
339 } | 339 } |
340 | 340 |
341 } // namespace android | 341 } // namespace android |
342 } // namespace chrome | 342 } // namespace chrome |
OLD | NEW |