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

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

Issue 448423002: Use a qualified path for grit includes in chrome/browser/chromeos. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix build Created 6 years, 4 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) 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/file_util.h" 8 #include "base/file_util.h"
9 #include "base/prefs/pref_change_registrar.h" 9 #include "base/prefs/pref_change_registrar.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 19 matching lines...) Expand all
30 #include "chrome/browser/drive/drive_app_registry.h" 30 #include "chrome/browser/drive/drive_app_registry.h"
31 #include "chrome/browser/drive/drive_notification_manager.h" 31 #include "chrome/browser/drive/drive_notification_manager.h"
32 #include "chrome/browser/drive/drive_notification_manager_factory.h" 32 #include "chrome/browser/drive/drive_notification_manager_factory.h"
33 #include "chrome/browser/drive/event_logger.h" 33 #include "chrome/browser/drive/event_logger.h"
34 #include "chrome/browser/profiles/incognito_helpers.h" 34 #include "chrome/browser/profiles/incognito_helpers.h"
35 #include "chrome/browser/profiles/profile.h" 35 #include "chrome/browser/profiles/profile.h"
36 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" 36 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
37 #include "chrome/browser/signin/signin_manager_factory.h" 37 #include "chrome/browser/signin/signin_manager_factory.h"
38 #include "chrome/common/chrome_version_info.h" 38 #include "chrome/common/chrome_version_info.h"
39 #include "chrome/common/pref_names.h" 39 #include "chrome/common/pref_names.h"
40 #include "chrome/grit/generated_resources.h"
40 #include "components/keyed_service/content/browser_context_dependency_manager.h" 41 #include "components/keyed_service/content/browser_context_dependency_manager.h"
41 #include "components/signin/core/browser/profile_oauth2_token_service.h" 42 #include "components/signin/core/browser/profile_oauth2_token_service.h"
42 #include "components/signin/core/browser/signin_manager.h" 43 #include "components/signin/core/browser/signin_manager.h"
43 #include "content/public/browser/browser_context.h" 44 #include "content/public/browser/browser_context.h"
44 #include "content/public/browser/browser_thread.h" 45 #include "content/public/browser/browser_thread.h"
45 #include "content/public/browser/notification_service.h" 46 #include "content/public/browser/notification_service.h"
46 #include "content/public/common/user_agent.h" 47 #include "content/public/common/user_agent.h"
47 #include "google_apis/drive/auth_service.h" 48 #include "google_apis/drive/auth_service.h"
48 #include "google_apis/drive/gdata_wapi_url_generator.h" 49 #include "google_apis/drive/gdata_wapi_url_generator.h"
49 #include "grit/generated_resources.h"
50 #include "ui/base/l10n/l10n_util.h" 50 #include "ui/base/l10n/l10n_util.h"
51 #include "webkit/browser/fileapi/external_mount_points.h" 51 #include "webkit/browser/fileapi/external_mount_points.h"
52 52
53 using content::BrowserContext; 53 using content::BrowserContext;
54 using content::BrowserThread; 54 using content::BrowserThread;
55 55
56 namespace drive { 56 namespace drive {
57 namespace { 57 namespace {
58 58
59 // Name of the directory used to store metadata. 59 // Name of the directory used to store metadata.
(...skipping 586 matching lines...) Expand 10 before | Expand all | Expand 10 after
646 profile, preference_watcher, 646 profile, preference_watcher,
647 NULL, std::string(), base::FilePath(), NULL); 647 NULL, std::string(), base::FilePath(), NULL);
648 } else { 648 } else {
649 service = factory_for_test_->Run(profile); 649 service = factory_for_test_->Run(profile);
650 } 650 }
651 651
652 return service; 652 return service;
653 } 653 }
654 654
655 } // namespace drive 655 } // namespace drive
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/chromeos_utils.cc ('k') | chrome/browser/chromeos/enrollment_dialog_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698