chrome/browser/android/chrome_web_contents_delegate_android.cc - Issue 735473002: Rename app_modal_dialogs dir to app_modal

Side by Side Diff: chrome/browser/android/chrome_web_contents_delegate_android.cc

Issue 735473002: Rename app_modal_dialogs dir to app_modal (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master

Patch Set: rebase Created 6 years, 1 month 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

« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/chrome_browser_main.cc » ('j') | no next file with comments »

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"

11 #include "chrome/browser/file_select_helper.h"	11 #include "chrome/browser/file_select_helper.h"

12 #include "chrome/browser/media/media_capture_devices_dispatcher.h"	12 #include "chrome/browser/media/media_capture_devices_dispatcher.h"

13 #include "chrome/browser/media/protected_media_identifier_permission_context.h"	13 #include "chrome/browser/media/protected_media_identifier_permission_context.h"

14 #include "chrome/browser/media/protected_media_identifier_permission_context_fac tory.h"	14 #include "chrome/browser/media/protected_media_identifier_permission_context_fac tory.h"

15 #include "chrome/browser/prerender/prerender_manager.h"	15 #include "chrome/browser/prerender/prerender_manager.h"

16 #include "chrome/browser/prerender/prerender_manager_factory.h"	16 #include "chrome/browser/prerender/prerender_manager_factory.h"

17 #include "chrome/browser/profiles/profile.h"	17 #include "chrome/browser/profiles/profile.h"

18 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h"	18 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h"

19 #include "chrome/browser/ui/browser_navigator.h"	19 #include "chrome/browser/ui/browser_navigator.h"

20 #include "chrome/browser/ui/find_bar/find_notification_details.h"	20 #include "chrome/browser/ui/find_bar/find_notification_details.h"

21 #include "chrome/browser/ui/find_bar/find_tab_helper.h"	21 #include "chrome/browser/ui/find_bar/find_tab_helper.h"

22 #include "chrome/browser/ui/tab_helpers.h"	22 #include "chrome/browser/ui/tab_helpers.h"

23 #include "chrome/common/chrome_switches.h"	23 #include "chrome/common/chrome_switches.h"

24 #include "components/app_modal_dialogs/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/rect.h"

(...skipping 297 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
332 }	332 }

333	333

334 if (was_blocked)	334 if (was_blocked)

335 *was_blocked = !handled;	335 *was_blocked = !handled;

336 if (!handled)	336 if (!handled)

337 delete new_contents;	337 delete new_contents;

338 }	338 }

339	339

340 } // namespace android	340 } // namespace android

341 } // namespace chrome	341 } // namespace chrome

OLD	NEW