athena/main/athena_main.cc - Issue 555313002: Cleanup: Use base/files/file_util.h instead of base/file_util.h in ash/, athena/, and chromeos/

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

Unified Diff: athena/main/athena_main.cc

Issue 555313002: Cleanup: Use base/files/file_util.h instead of base/file_util.h in ash/, athena/, and chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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 side-by-side diff with in-line comments

Download patch

Index: athena/main/athena_main.cc

diff --git a/athena/main/athena_main.cc b/athena/main/athena_main.cc

index 3c66f18d2fa2e79c93af93ae7578f7441922e0c1..7507ff5e22275c77419d0f67afce737a74fcd647 100644

--- a/athena/main/athena_main.cc

+++ b/athena/main/athena_main.cc

@@ -12,7 +12,7 @@

#include "athena/main/public/athena_launcher.h"

#include "athena/screen/public/screen_manager.h"

#include "base/command_line.h"

-#include "base/file_util.h"

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

#include "base/path_service.h"

#include "components/pdf/renderer/ppb_pdf_impl.h"

#include "content/public/app/content_main.h"

@@ -38,7 +38,7 @@ namespace {

const char kDefaultAppPath[] =

"chrome/common/extensions/docs/examples/apps/calculator/app";

-} // namespace athena

+} // namespace

class AthenaDesktopController : public extensions::DesktopController {

public:

« no previous file with comments | « ash/desktop_background/desktop_background_controller.cc ('k') | athena/system/orientation_controller.cc » ('j') | no next file with comments »