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

Side by Side Diff: chrome/browser/chromeos/drive/file_system_util.cc

Issue 559063002: Remove webkit/browser/, point everything to storage/browser/ instead (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clean up DEPS per feedback 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
OLDNEW
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/chromeos/drive/file_system_util.h" 5 #include "chrome/browser/chromeos/drive/file_system_util.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 21 matching lines...) Expand all
32 #include "chrome/browser/profiles/profile.h" 32 #include "chrome/browser/profiles/profile.h"
33 #include "chrome/browser/profiles/profile_manager.h" 33 #include "chrome/browser/profiles/profile_manager.h"
34 #include "chrome/common/chrome_constants.h" 34 #include "chrome/common/chrome_constants.h"
35 #include "chrome/common/chrome_paths_internal.h" 35 #include "chrome/common/chrome_paths_internal.h"
36 #include "chrome/common/pref_names.h" 36 #include "chrome/common/pref_names.h"
37 #include "chrome/common/url_constants.h" 37 #include "chrome/common/url_constants.h"
38 #include "chromeos/chromeos_constants.h" 38 #include "chromeos/chromeos_constants.h"
39 #include "components/user_manager/user_manager.h" 39 #include "components/user_manager/user_manager.h"
40 #include "content/public/browser/browser_thread.h" 40 #include "content/public/browser/browser_thread.h"
41 #include "net/base/escape.h" 41 #include "net/base/escape.h"
42 #include "webkit/browser/fileapi/file_system_url.h" 42 #include "storage/browser/fileapi/file_system_url.h"
43 43
44 using content::BrowserThread; 44 using content::BrowserThread;
45 45
46 namespace drive { 46 namespace drive {
47 namespace util { 47 namespace util {
48 48
49 namespace { 49 namespace {
50 50
51 std::string ReadStringFromGDocFile(const base::FilePath& file_path, 51 std::string ReadStringFromGDocFile(const base::FilePath& file_path,
52 const std::string& key) { 52 const std::string& key) {
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
383 const bool disable_sync_over_celluar = 383 const bool disable_sync_over_celluar =
384 profile->GetPrefs()->GetBoolean(prefs::kDisableDriveOverCellular); 384 profile->GetPrefs()->GetBoolean(prefs::kDisableDriveOverCellular);
385 385
386 if (is_connection_cellular && disable_sync_over_celluar) 386 if (is_connection_cellular && disable_sync_over_celluar)
387 return DRIVE_CONNECTED_METERED; 387 return DRIVE_CONNECTED_METERED;
388 return DRIVE_CONNECTED; 388 return DRIVE_CONNECTED;
389 } 389 }
390 390
391 } // namespace util 391 } // namespace util
392 } // namespace drive 392 } // namespace drive
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/drive/file_change.h ('k') | chrome/browser/chromeos/drive/file_system_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698