chrome/browser/ui/webui/version_handler.cc - Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/

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/version_handler.cc

Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix bad merge Created 6 years, 3 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 | « chrome/browser/ui/webui/profiler_ui.cc ('k') | chrome/browser/upload_list.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/ui/webui/version_handler.h"	5 #include "chrome/browser/ui/webui/version_handler.h"

6	6

7 #include "base/command_line.h"	7 #include "base/command_line.h"

8 #include "base/file_util.h"	8 #include "base/files/file_util.h"

9 #include "base/metrics/field_trial.h"	9 #include "base/metrics/field_trial.h"

10 #include "base/strings/string_util.h"	10 #include "base/strings/string_util.h"

11 #include "base/strings/utf_string_conversions.h"	11 #include "base/strings/utf_string_conversions.h"

12 #include "chrome/browser/plugins/plugin_prefs.h"	12 #include "chrome/browser/plugins/plugin_prefs.h"

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

14 #include "components/variations/active_field_trials.h"	14 #include "components/variations/active_field_trials.h"

15 #include "content/public/browser/browser_thread.h"	15 #include "content/public/browser/browser_thread.h"

16 #include "content/public/browser/plugin_service.h"	16 #include "content/public/browser/plugin_service.h"

17 #include "content/public/browser/web_ui.h"	17 #include "content/public/browser/web_ui.h"

18 #include "content/public/common/content_constants.h"	18 #include "content/public/common/content_constants.h"

(...skipping 122 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
141 flash_version = info_array[i].version;	141 flash_version = info_array[i].version;

142 break;	142 break;

143 }	143 }

144 }	144 }

145 }	145 }

146	146

147 base::StringValue arg(flash_version);	147 base::StringValue arg(flash_version);

148 web_ui()->CallJavascriptFunction("returnFlashVersion", arg);	148 web_ui()->CallJavascriptFunction("returnFlashVersion", arg);

149 }	149 }

150 #endif // defined(ENABLE_PLUGINS)	150 #endif // defined(ENABLE_PLUGINS)

OLD	NEW