chrome/browser/android/chrome_web_contents_delegate_android.cc - Issue 13926012: Move media_stream_infobar_delegate.* from c/b/ui/ to c/b/media/.

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

Issue 13926012: Move media_stream_infobar_delegate.* from c/b/ui/ to c/b/media/. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 7 years, 8 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 | Annotate | Revision Log

« no previous file with comments | « no previous file | chrome/browser/automation/testing_automation_provider.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/metrics/histogram.h"	8 #include "base/metrics/histogram.h"

9 #include "base/string_util.h"	9 #include "base/string_util.h"

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

11 #include "chrome/browser/google/google_url_tracker.h"	11 #include "chrome/browser/google/google_url_tracker.h"

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

12 #include "chrome/browser/profiles/profile.h"	13 #include "chrome/browser/profiles/profile.h"

13 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h"	14 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h"

14 #include "chrome/browser/ui/find_bar/find_match_rects_details.h"	15 #include "chrome/browser/ui/find_bar/find_match_rects_details.h"

15 #include "chrome/browser/ui/find_bar/find_notification_details.h"	16 #include "chrome/browser/ui/find_bar/find_notification_details.h"

16 #include "chrome/browser/ui/find_bar/find_tab_helper.h"	17 #include "chrome/browser/ui/find_bar/find_tab_helper.h"

17 #include "chrome/browser/ui/media_stream_infobar_delegate.h"

18 #include "chrome/common/chrome_notification_types.h"	18 #include "chrome/common/chrome_notification_types.h"

19 #include "content/public/browser/navigation_entry.h"	19 #include "content/public/browser/navigation_entry.h"

20 #include "content/public/browser/notification_details.h"	20 #include "content/public/browser/notification_details.h"

21 #include "content/public/browser/notification_service.h"	21 #include "content/public/browser/notification_service.h"

22 #include "content/public/browser/notification_source.h"	22 #include "content/public/browser/notification_source.h"

23 #include "content/public/browser/web_contents.h"	23 #include "content/public/browser/web_contents.h"

24 #include "content/public/common/file_chooser_params.h"	24 #include "content/public/common/file_chooser_params.h"

25 #include "content/public/common/page_transition_types.h"	25 #include "content/public/common/page_transition_types.h"

26 #include "jni/ChromeWebContentsDelegateAndroid_jni.h"	26 #include "jni/ChromeWebContentsDelegateAndroid_jni.h"

27 #include "ui/gfx/rect.h"	27 #include "ui/gfx/rect.h"

(...skipping 233 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
261 web_contents, url, plugin_path, callback);	261 web_contents, url, plugin_path, callback);

262 return true;	262 return true;

263 #else	263 #else

264 return false;	264 return false;

265 #endif	265 #endif

266 }	266 }

267	267

268	268

269 } // namespace android	269 } // namespace android

270 } // namespace chrome	270 } // namespace chrome

OLD	NEW