chrome/browser/chromeos/extensions/default_app_order.cc - Issue 14192016: Move OS_CHROMEOS-specific paths to chromeos/chromeos_paths.cc.

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: chrome/browser/chromeos/extensions/default_app_order.cc

Issue 14192016: Move OS_CHROMEOS-specific paths to chromeos/chromeos_paths.cc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase 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:

Index: chrome/browser/chromeos/extensions/default_app_order.cc

diff --git a/chrome/browser/chromeos/extensions/default_app_order.cc b/chrome/browser/chromeos/extensions/default_app_order.cc

index 3f6bce44efb81259b651b2f61c65b9b9353adb62..0d1974533cb971ec1cf3f93e9da0b471e970a43a 100644

--- a/chrome/browser/chromeos/extensions/default_app_order.cc

+++ b/chrome/browser/chromeos/extensions/default_app_order.cc

@@ -11,8 +11,8 @@

#include "base/json/json_file_value_serializer.h"

#include "base/path_service.h"

#include "base/time.h"

-#include "chrome/common/chrome_paths.h"

#include "chrome/common/extensions/extension_constants.h"

+#include "chromeos/chromeos_paths.h"

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

namespace chromeos {

@@ -109,7 +109,7 @@ const std::vector<std::string>& ExternalLoader::GetAppIds() {

void ExternalLoader::Load() {

base::FilePath ordinals_file;

- CHECK(PathService::Get(chrome::FILE_DEFAULT_APP_ORDER, &ordinals_file));

+ CHECK(PathService::Get(chromeos::FILE_DEFAULT_APP_ORDER, &ordinals_file));

scoped_ptr<base::ListValue> ordinals_value(

ReadExternalOrdinalFile(ordinals_file));