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

Side by Side Diff: chrome/browser/chromeos/extensions/file_browser_event_router.cc

Issue 10533042: Remove chromeos::GDataFileSystem::GetOperationRegistry() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 6 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/extensions/file_browser_event_router.h" 5 #include "chrome/browser/chromeos/extensions/file_browser_event_router.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/json/json_writer.h" 8 #include "base/json/json_writer.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/stl_util.h" 10 #include "base/stl_util.h"
11 #include "base/values.h" 11 #include "base/values.h"
12 #include "chrome/browser/chromeos/cros/cros_library.h" 12 #include "chrome/browser/chromeos/cros/cros_library.h"
13 #include "chrome/browser/chromeos/extensions/file_browser_notifications.h" 13 #include "chrome/browser/chromeos/extensions/file_browser_notifications.h"
14 #include "chrome/browser/chromeos/extensions/file_manager_util.h" 14 #include "chrome/browser/chromeos/extensions/file_manager_util.h"
15 #include "chrome/browser/chromeos/gdata/gdata_documents_service.h"
15 #include "chrome/browser/chromeos/gdata/gdata_system_service.h" 16 #include "chrome/browser/chromeos/gdata/gdata_system_service.h"
16 #include "chrome/browser/chromeos/gdata/gdata_util.h" 17 #include "chrome/browser/chromeos/gdata/gdata_util.h"
17 #include "chrome/browser/chromeos/login/base_login_display_host.h" 18 #include "chrome/browser/chromeos/login/base_login_display_host.h"
18 #include "chrome/browser/chromeos/login/screen_locker.h" 19 #include "chrome/browser/chromeos/login/screen_locker.h"
19 #include "chrome/browser/chromeos/login/user_manager.h" 20 #include "chrome/browser/chromeos/login/user_manager.h"
20 #include "chrome/browser/extensions/extension_event_names.h" 21 #include "chrome/browser/extensions/extension_event_names.h"
21 #include "chrome/browser/extensions/extension_event_router.h" 22 #include "chrome/browser/extensions/extension_event_router.h"
22 #include "chrome/browser/extensions/extension_service.h" 23 #include "chrome/browser/extensions/extension_service.h"
23 #include "chrome/browser/prefs/pref_change_registrar.h" 24 #include "chrome/browser/prefs/pref_change_registrar.h"
24 #include "chrome/browser/prefs/pref_service.h" 25 #include "chrome/browser/prefs/pref_service.h"
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 if (!profile_) { 110 if (!profile_) {
110 NOTREACHED(); 111 NOTREACHED();
111 return; 112 return;
112 } 113 }
113 DiskMountManager::GetInstance()->RemoveObserver(this); 114 DiskMountManager::GetInstance()->RemoveObserver(this);
114 115
115 GDataSystemService* system_service = 116 GDataSystemService* system_service =
116 GDataSystemServiceFactory::FindForProfile(profile_); 117 GDataSystemServiceFactory::FindForProfile(profile_);
117 if (system_service) { 118 if (system_service) {
118 system_service->file_system()->RemoveObserver(this); 119 system_service->file_system()->RemoveObserver(this);
119 system_service->file_system()->GetOperationRegistry()-> 120 system_service->docs_service()->operation_registry()->RemoveObserver(this);
120 RemoveObserver(this);
121 } 121 }
122 122
123 chromeos::NetworkLibrary* network_library = 123 chromeos::NetworkLibrary* network_library =
124 chromeos::CrosLibrary::Get()->GetNetworkLibrary(); 124 chromeos::CrosLibrary::Get()->GetNetworkLibrary();
125 if (network_library) 125 if (network_library)
126 network_library->RemoveNetworkManagerObserver(this); 126 network_library->RemoveNetworkManagerObserver(this);
127 127
128 profile_ = NULL; 128 profile_ = NULL;
129 } 129 }
130 130
131 void FileBrowserEventRouter::ObserveFileSystemEvents() { 131 void FileBrowserEventRouter::ObserveFileSystemEvents() {
132 if (!profile_) { 132 if (!profile_) {
133 NOTREACHED(); 133 NOTREACHED();
134 return; 134 return;
135 } 135 }
136 if (!chromeos::UserManager::Get()->IsUserLoggedIn()) 136 if (!chromeos::UserManager::Get()->IsUserLoggedIn())
137 return; 137 return;
138 138
139 DiskMountManager* disk_mount_manager = DiskMountManager::GetInstance(); 139 DiskMountManager* disk_mount_manager = DiskMountManager::GetInstance();
140 disk_mount_manager->RemoveObserver(this); 140 disk_mount_manager->RemoveObserver(this);
141 disk_mount_manager->AddObserver(this); 141 disk_mount_manager->AddObserver(this);
142 disk_mount_manager->RequestMountInfoRefresh(); 142 disk_mount_manager->RequestMountInfoRefresh();
143 143
144 GDataSystemService* system_service = 144 GDataSystemService* system_service =
145 GDataSystemServiceFactory::GetForProfile(profile_); 145 GDataSystemServiceFactory::GetForProfile(profile_);
146 if (!system_service) { 146 if (!system_service) {
147 NOTREACHED(); 147 NOTREACHED();
148 return; 148 return;
149 } 149 }
150 system_service->file_system()->GetOperationRegistry()->AddObserver(this); 150 system_service->docs_service()->operation_registry()->AddObserver(this);
151 system_service->file_system()->AddObserver(this); 151 system_service->file_system()->AddObserver(this);
152 152
153 chromeos::NetworkLibrary* network_library = 153 chromeos::NetworkLibrary* network_library =
154 chromeos::CrosLibrary::Get()->GetNetworkLibrary(); 154 chromeos::CrosLibrary::Get()->GetNetworkLibrary();
155 if (network_library) 155 if (network_library)
156 network_library->AddNetworkManagerObserver(this); 156 network_library->AddNetworkManagerObserver(this);
157 157
158 pref_change_registrar_->Init(profile_->GetPrefs()); 158 pref_change_registrar_->Init(profile_->GetPrefs());
159 pref_change_registrar_->Add(prefs::kDisableGDataOverCellular, this); 159 pref_change_registrar_->Add(prefs::kDisableGDataOverCellular, this);
160 pref_change_registrar_->Add(prefs::kDisableGDataHostedFiles, this); 160 pref_change_registrar_->Add(prefs::kDisableGDataHostedFiles, this);
(...skipping 616 matching lines...) Expand 10 before | Expand all | Expand 10 after
777 return scoped_refptr<RefcountedProfileKeyedService>( 777 return scoped_refptr<RefcountedProfileKeyedService>(
778 new FileBrowserEventRouter(profile)); 778 new FileBrowserEventRouter(profile));
779 } 779 }
780 780
781 bool FileBrowserEventRouterFactory::ServiceHasOwnInstanceInIncognito() { 781 bool FileBrowserEventRouterFactory::ServiceHasOwnInstanceInIncognito() {
782 // Explicitly and always allow this router in guest login mode. see 782 // Explicitly and always allow this router in guest login mode. see
783 // chrome/browser/profiles/profile_keyed_base_factory.h comment 783 // chrome/browser/profiles/profile_keyed_base_factory.h comment
784 // for the details. 784 // for the details.
785 return true; 785 return true;
786 } 786 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698