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

Side by Side Diff: chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.cc

Issue 25366003: Moved some functions off ExtensionService into a new file extension_util. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Compile failures Created 7 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) 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/extensions/api/media_galleries_private/media_galleries_ private_api.h" 5 #include "chrome/browser/extensions/api/media_galleries_private/media_galleries_ private_api.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
11 #include "base/location.h" 11 #include "base/location.h"
12 #include "base/prefs/pref_service.h" 12 #include "base/prefs/pref_service.h"
13 #include "base/strings/string_number_conversions.h" 13 #include "base/strings/string_number_conversions.h"
14 #include "chrome/browser/browser_process.h" 14 #include "chrome/browser/browser_process.h"
15 #include "chrome/browser/extensions/api/media_galleries_private/gallery_watch_ma nager.h" 15 #include "chrome/browser/extensions/api/media_galleries_private/gallery_watch_ma nager.h"
16 #include "chrome/browser/extensions/api/media_galleries_private/media_galleries_ private_event_router.h" 16 #include "chrome/browser/extensions/api/media_galleries_private/media_galleries_ private_event_router.h"
17 #include "chrome/browser/extensions/event_names.h" 17 #include "chrome/browser/extensions/event_names.h"
18 #include "chrome/browser/extensions/event_router.h" 18 #include "chrome/browser/extensions/event_router.h"
19 #include "chrome/browser/extensions/extension_function.h" 19 #include "chrome/browser/extensions/extension_function.h"
20 #include "chrome/browser/extensions/extension_service.h" 20 #include "chrome/browser/extensions/extension_service.h"
21 #include "chrome/browser/extensions/extension_system.h" 21 #include "chrome/browser/extensions/extension_system.h"
22 #include "chrome/browser/extensions/extension_util.h"
22 #include "chrome/browser/media_galleries/media_file_system_registry.h" 23 #include "chrome/browser/media_galleries/media_file_system_registry.h"
23 #include "chrome/browser/media_galleries/media_galleries_preferences.h" 24 #include "chrome/browser/media_galleries/media_galleries_preferences.h"
24 #include "chrome/browser/profiles/profile.h" 25 #include "chrome/browser/profiles/profile.h"
25 #include "chrome/browser/storage_monitor/storage_monitor.h" 26 #include "chrome/browser/storage_monitor/storage_monitor.h"
26 #include "chrome/common/extensions/api/media_galleries_private/media_galleries_h andler.h" 27 #include "chrome/common/extensions/api/media_galleries_private/media_galleries_h andler.h"
27 #include "content/public/browser/browser_thread.h" 28 #include "content/public/browser/browser_thread.h"
28 #include "content/public/browser/render_view_host.h" 29 #include "content/public/browser/render_view_host.h"
29 30
30 using base::DictionaryValue; 31 using base::DictionaryValue;
31 using base::ListValue; 32 using base::ListValue;
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 extensions::ExtensionSystem::Get(profile_)->extension_service(); 375 extensions::ExtensionSystem::Get(profile_)->extension_service();
375 DCHECK(service); 376 DCHECK(service);
376 377
377 ListValue* result_list = new ListValue; 378 ListValue* result_list = new ListValue;
378 379
379 for (ExtensionSet::const_iterator iter = service->extensions()->begin(); 380 for (ExtensionSet::const_iterator iter = service->extensions()->begin();
380 iter != service->extensions()->end(); 381 iter != service->extensions()->end();
381 ++iter) { 382 ++iter) {
382 const Extension* extension = iter->get(); 383 const Extension* extension = iter->get();
383 if (profile_->IsOffTheRecord() && 384 if (profile_->IsOffTheRecord() &&
384 !service->IsIncognitoEnabled(extension->id())) 385 !extension_util::IsIncognitoEnabled(extension->id(), service))
385 continue; 386 continue;
386 387
387 MediaGalleriesHandler::List* handler_list = 388 MediaGalleriesHandler::List* handler_list =
388 MediaGalleriesHandler::GetHandlers(extension); 389 MediaGalleriesHandler::GetHandlers(extension);
389 if (!handler_list) 390 if (!handler_list)
390 continue; 391 continue;
391 392
392 for (MediaGalleriesHandler::List::const_iterator action_iter = 393 for (MediaGalleriesHandler::List::const_iterator action_iter =
393 handler_list->begin(); 394 handler_list->begin();
394 action_iter != handler_list->end(); 395 action_iter != handler_list->end();
395 ++action_iter) { 396 ++action_iter) {
396 const MediaGalleriesHandler* action = action_iter->get(); 397 const MediaGalleriesHandler* action = action_iter->get();
397 DictionaryValue* handler = new DictionaryValue; 398 DictionaryValue* handler = new DictionaryValue;
398 handler->SetString("extensionId", action->extension_id()); 399 handler->SetString("extensionId", action->extension_id());
399 handler->SetString("id", action->id()); 400 handler->SetString("id", action->id());
400 handler->SetString("title", action->title()); 401 handler->SetString("title", action->title());
401 handler->SetString("iconUrl", action->icon_path()); 402 handler->SetString("iconUrl", action->icon_path());
402 result_list->Append(handler); 403 result_list->Append(handler);
403 } 404 }
404 } 405 }
405 406
406 SetResult(result_list); 407 SetResult(result_list);
407 SendResponse(true); 408 SendResponse(true);
408 409
409 return true; 410 return true;
410 } 411 }
411 412
412 } // namespace extensions 413 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698