chrome/browser/ui/webui/flash_ui.cc - Issue 7096016: Remove JS dialog dependency from content.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/ui/webui/flash_ui.cc

Issue 7096016: Remove JS dialog dependency from content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: one more DEPS item removal Created 9 years, 6 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

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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/ui/webui/flash_ui.h"	5 #include "chrome/browser/ui/webui/flash_ui.h"

6	6

7 #include "base/i18n/time_formatting.h"	7 #include "base/i18n/time_formatting.h"

8 #include "base/string_number_conversions.h"	8 #include "base/string_number_conversions.h"

9 #include "base/threading/thread_restrictions.h"	9 #include "base/threading/thread_restrictions.h"

	10 #include "base/utf_string_conversions.h"

10 #include "base/values.h"	11 #include "base/values.h"

11 #include "chrome/browser/crash_upload_list.h"	12 #include "chrome/browser/crash_upload_list.h"

12 #include "chrome/browser/platform_util.h"	13 #include "chrome/browser/platform_util.h"

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

14 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"	15 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"

15 #include "chrome/browser/ui/webui/crashes_ui.h"	16 #include "chrome/browser/ui/webui/crashes_ui.h"

16 #include "chrome/common/chrome_version_info.h"	17 #include "chrome/common/chrome_version_info.h"

17 #include "chrome/common/jstemplate_builder.h"	18 #include "chrome/common/jstemplate_builder.h"

18 #include "chrome/common/url_constants.h"	19 #include "chrome/common/url_constants.h"

19 #include "content/browser/gpu/gpu_data_manager.h"	20 #include "content/browser/gpu/gpu_data_manager.h"

(...skipping 322 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
342	343

343 // Set up the about:flash source.	344 // Set up the about:flash source.

344 contents->profile()->GetChromeURLDataManager()->AddDataSource(html_source);	345 contents->profile()->GetChromeURLDataManager()->AddDataSource(html_source);

345 }	346 }

346	347

347 // static	348 // static

348 RefCountedMemory* FlashUI::GetFaviconResourceBytes() {	349 RefCountedMemory* FlashUI::GetFaviconResourceBytes() {

349 // Use the default icon for now.	350 // Use the default icon for now.

350 return NULL;	351 return NULL;

351 }	352 }

OLD	NEW