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

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

Issue 671783002: Reverting instrumentations (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
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/profiler/scoped_profile.h"
14 #include "base/strings/string_number_conversions.h" 13 #include "base/strings/string_number_conversions.h"
15 #include "chrome/browser/browser_process.h" 14 #include "chrome/browser/browser_process.h"
16 #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"
17 #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"
18 #include "chrome/browser/extensions/extension_util.h" 17 #include "chrome/browser/extensions/extension_util.h"
19 #include "chrome/browser/media_galleries/media_file_system_registry.h" 18 #include "chrome/browser/media_galleries/media_file_system_registry.h"
20 #include "chrome/browser/media_galleries/media_galleries_preferences.h" 19 #include "chrome/browser/media_galleries/media_galleries_preferences.h"
21 #include "chrome/browser/profiles/profile.h" 20 #include "chrome/browser/profiles/profile.h"
22 #include "content/public/browser/browser_thread.h" 21 #include "content/public/browser/browser_thread.h"
23 #include "content/public/browser/render_view_host.h" 22 #include "content/public/browser/render_view_host.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 } 108 }
110 109
111 // static 110 // static
112 MediaGalleriesPrivateAPI* MediaGalleriesPrivateAPI::Get( 111 MediaGalleriesPrivateAPI* MediaGalleriesPrivateAPI::Get(
113 content::BrowserContext* context) { 112 content::BrowserContext* context) {
114 return BrowserContextKeyedAPIFactory<MediaGalleriesPrivateAPI>::Get(context); 113 return BrowserContextKeyedAPIFactory<MediaGalleriesPrivateAPI>::Get(context);
115 } 114 }
116 115
117 void MediaGalleriesPrivateAPI::OnListenerAdded( 116 void MediaGalleriesPrivateAPI::OnListenerAdded(
118 const EventListenerInfo& details) { 117 const EventListenerInfo& details) {
119 // TODO(vadimt): Remove ScopedProfile below once crbug.com/417106 is fixed.
120 tracked_objects::ScopedProfile tracking_profile(
121 FROM_HERE_WITH_EXPLICIT_FUNCTION(
122 "MediaGalleriesPrivateAPI::OnListenerAdded"));
123
124 // Make sure MediaGalleriesPreferences is initialized. After that, 118 // Make sure MediaGalleriesPreferences is initialized. After that,
125 // try to initialize the event router for the listener. 119 // try to initialize the event router for the listener.
126 // This method is called synchronously with the message handler for the 120 // This method is called synchronously with the message handler for the
127 // JS invocation. 121 // JS invocation.
128 122
129 MediaGalleriesPreferences* preferences = 123 MediaGalleriesPreferences* preferences =
130 g_browser_process->media_file_system_registry()->GetPreferences(profile_); 124 g_browser_process->media_file_system_registry()->GetPreferences(profile_);
131 preferences->EnsureInitialized(base::Bind( 125 preferences->EnsureInitialized(base::Bind(
132 &MediaGalleriesPrivateAPI::MaybeInitializeEventRouterAndTracker, 126 &MediaGalleriesPrivateAPI::MaybeInitializeEventRouterAndTracker,
133 weak_ptr_factory_.GetWeakPtr())); 127 weak_ptr_factory_.GetWeakPtr()));
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 g_browser_process->media_file_system_registry()->GetPreferences( 350 g_browser_process->media_file_system_registry()->GetPreferences(
357 GetProfile()); 351 GetProfile());
358 GalleryWatchStateTracker* state_tracker = MediaGalleriesPrivateAPI::Get( 352 GalleryWatchStateTracker* state_tracker = MediaGalleriesPrivateAPI::Get(
359 GetProfile())->GetGalleryWatchStateTracker(); 353 GetProfile())->GetGalleryWatchStateTracker();
360 state_tracker->RemoveAllGalleryWatchersForExtension( 354 state_tracker->RemoveAllGalleryWatchersForExtension(
361 extension_id(), preferences); 355 extension_id(), preferences);
362 SendResponse(true); 356 SendResponse(true);
363 } 357 }
364 358
365 } // namespace extensions 359 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698