Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(253)

Side by Side Diff: chrome/browser/component_updater/pepper_flash_component_installer.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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 <string.h> 5 #include <string.h>
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/base_paths.h" 9 #include "base/base_paths.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/file_util.h"
14 #include "base/files/file_enumerator.h" 13 #include "base/files/file_enumerator.h"
15 #include "base/files/file_path.h" 14 #include "base/files/file_path.h"
15 #include "base/files/file_util.h"
16 #include "base/logging.h" 16 #include "base/logging.h"
17 #include "base/path_service.h" 17 #include "base/path_service.h"
18 #include "base/strings/string_split.h" 18 #include "base/strings/string_split.h"
19 #include "base/strings/string_util.h" 19 #include "base/strings/string_util.h"
20 #include "base/strings/stringprintf.h" 20 #include "base/strings/stringprintf.h"
21 #include "base/strings/utf_string_conversions.h" 21 #include "base/strings/utf_string_conversions.h"
22 #include "base/values.h" 22 #include "base/values.h"
23 #include "base/version.h" 23 #include "base/version.h"
24 #include "build/build_config.h" 24 #include "build/build_config.h"
25 #include "chrome/browser/component_updater/flash_component_installer.h" 25 #include "chrome/browser/component_updater/flash_component_installer.h"
(...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after
507 CommandLine* cmd_line = CommandLine::ForCurrentProcess(); 507 CommandLine* cmd_line = CommandLine::ForCurrentProcess();
508 if (cmd_line->HasSwitch(switches::kDisableBundledPpapiFlash)) 508 if (cmd_line->HasSwitch(switches::kDisableBundledPpapiFlash))
509 return; 509 return;
510 BrowserThread::PostTask(BrowserThread::FILE, 510 BrowserThread::PostTask(BrowserThread::FILE,
511 FROM_HERE, 511 FROM_HERE,
512 base::Bind(&StartPepperFlashUpdateRegistration, cus)); 512 base::Bind(&StartPepperFlashUpdateRegistration, cus));
513 #endif 513 #endif
514 } 514 }
515 515
516 } // namespace component_updater 516 } // namespace component_updater
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698