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

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

Issue 15702003: Move webkit/user_agent/ into webkit/common (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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/DEPS ('k') | chrome/browser/ui/browser_commands.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/drive_integration_service.h" 5 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
(...skipping 20 matching lines...) Expand all
31 #include "chrome/browser/profiles/profile.h" 31 #include "chrome/browser/profiles/profile.h"
32 #include "chrome/browser/sync/profile_sync_service_factory.h" 32 #include "chrome/browser/sync/profile_sync_service_factory.h"
33 #include "chrome/common/chrome_switches.h" 33 #include "chrome/common/chrome_switches.h"
34 #include "chrome/common/chrome_version_info.h" 34 #include "chrome/common/chrome_version_info.h"
35 #include "chrome/common/pref_names.h" 35 #include "chrome/common/pref_names.h"
36 #include "components/browser_context_keyed_service/browser_context_dependency_ma nager.h" 36 #include "components/browser_context_keyed_service/browser_context_dependency_ma nager.h"
37 #include "content/public/browser/browser_context.h" 37 #include "content/public/browser/browser_context.h"
38 #include "content/public/browser/browser_thread.h" 38 #include "content/public/browser/browser_thread.h"
39 #include "content/public/browser/storage_partition.h" 39 #include "content/public/browser/storage_partition.h"
40 #include "google/cacheinvalidation/types.pb.h" 40 #include "google/cacheinvalidation/types.pb.h"
41 #include "webkit/common/user_agent/user_agent_util.h"
41 #include "webkit/fileapi/external_mount_points.h" 42 #include "webkit/fileapi/external_mount_points.h"
42 #include "webkit/user_agent/user_agent_util.h"
43 43
44 using content::BrowserContext; 44 using content::BrowserContext;
45 using content::BrowserThread; 45 using content::BrowserThread;
46 46
47 namespace drive { 47 namespace drive {
48 namespace { 48 namespace {
49 49
50 static const size_t kEventLogHistorySize = 100; 50 static const size_t kEventLogHistorySize = 100;
51 51
52 // Returns true if Drive is enabled for the given Profile. 52 // Returns true if Drive is enabled for the given Profile.
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
429 profile, NULL, base::FilePath(), NULL); 429 profile, NULL, base::FilePath(), NULL);
430 } else { 430 } else {
431 service = factory_for_test_.Run(profile); 431 service = factory_for_test_.Run(profile);
432 } 432 }
433 433
434 service->Initialize(); 434 service->Initialize();
435 return service; 435 return service;
436 } 436 }
437 437
438 } // namespace drive 438 } // namespace drive
OLDNEW
« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/ui/browser_commands.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698