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

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

Issue 8049002: Don't show hidden devices in UI (exept from imageburner). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 'mock library update' Created 9 years, 2 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/json/json_writer.h" 7 #include "base/json/json_writer.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/stl_util.h" 9 #include "base/stl_util.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 iter->second->extensions.erase(extension_id); 148 iter->second->extensions.erase(extension_id);
149 if (iter->second->extensions.empty()) { 149 if (iter->second->extensions.empty()) {
150 delete iter->second; 150 delete iter->second;
151 file_watchers_.erase(iter); 151 file_watchers_.erase(iter);
152 } 152 }
153 } 153 }
154 154
155 void ExtensionFileBrowserEventRouter::DiskChanged( 155 void ExtensionFileBrowserEventRouter::DiskChanged(
156 chromeos::MountLibraryEventType event, 156 chromeos::MountLibraryEventType event,
157 const chromeos::MountLibrary::Disk* disk) { 157 const chromeos::MountLibrary::Disk* disk) {
158 // Disregard hidden devices.
159 if (disk->is_hidden())
160 return;
158 if (event == chromeos::MOUNT_DISK_ADDED) { 161 if (event == chromeos::MOUNT_DISK_ADDED) {
159 OnDiskAdded(disk); 162 OnDiskAdded(disk);
160 } else if (event == chromeos::MOUNT_DISK_REMOVED) { 163 } else if (event == chromeos::MOUNT_DISK_REMOVED) {
161 OnDiskRemoved(disk); 164 OnDiskRemoved(disk);
162 } 165 }
163 } 166 }
164 167
165 void ExtensionFileBrowserEventRouter::DeviceChanged( 168 void ExtensionFileBrowserEventRouter::DeviceChanged(
166 chromeos::MountLibraryEventType event, 169 chromeos::MountLibraryEventType event,
167 const std::string& device_path) { 170 const std::string& device_path) {
168 if (event == chromeos::MOUNT_DEVICE_ADDED) { 171 if (event == chromeos::MOUNT_DEVICE_ADDED) {
169 OnDeviceAdded(device_path); 172 OnDeviceAdded(device_path);
170 } else if (event == chromeos::MOUNT_DEVICE_REMOVED) { 173 } else if (event == chromeos::MOUNT_DEVICE_REMOVED) {
171 OnDeviceRemoved(device_path); 174 OnDeviceRemoved(device_path);
172 } else if (event == chromeos::MOUNT_DEVICE_SCANNED) { 175 } else if (event == chromeos::MOUNT_DEVICE_SCANNED) {
173 OnDeviceScanned(device_path); 176 OnDeviceScanned(device_path);
174 } else if (event == chromeos::MOUNT_FORMATTING_STARTED) { 177 } else if (event == chromeos::MOUNT_FORMATTING_STARTED) {
178 // TODO(tbarzic): get rid of '!'.
175 if (device_path[0] == '!') { 179 if (device_path[0] == '!') {
176 OnFormattingStarted(device_path.substr(1), false); 180 OnFormattingStarted(device_path.substr(1), false);
177 } else { 181 } else {
178 OnFormattingStarted(device_path, true); 182 OnFormattingStarted(device_path, true);
179 } 183 }
180 } else if (event == chromeos::MOUNT_FORMATTING_FINISHED) { 184 } else if (event == chromeos::MOUNT_FORMATTING_FINISHED) {
181 if (device_path[0] == '!') { 185 if (device_path[0] == '!') {
182 OnFormattingFinished(device_path.substr(1), false); 186 OnFormattingFinished(device_path.substr(1), false);
183 } else { 187 } else {
184 OnFormattingFinished(device_path, true); 188 OnFormattingFinished(device_path, true);
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
455 &FileWatcherDelegate::HandleFileWatchOnUIThread, 459 &FileWatcherDelegate::HandleFileWatchOnUIThread,
456 local_path, 460 local_path,
457 true)); // got_error 461 true)); // got_error
458 } 462 }
459 463
460 void 464 void
461 ExtensionFileBrowserEventRouter::FileWatcherDelegate::HandleFileWatchOnUIThread( 465 ExtensionFileBrowserEventRouter::FileWatcherDelegate::HandleFileWatchOnUIThread(
462 const FilePath& local_path, bool got_error) { 466 const FilePath& local_path, bool got_error) {
463 router_->HandleFileWatchNotification(local_path, got_error); 467 router_->HandleFileWatchNotification(local_path, got_error);
464 } 468 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/cros/mount_library.cc ('k') | chrome/browser/extensions/extension_file_browser_private_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698