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

Unified Diff: chrome/browser/chromeos/extensions/file_browser_private_api.h

Issue 13474015: drive: Fix lifetime model of FileBrowserEventRouter (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address comments Created 7 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/extensions/file_browser_private_api.h
diff --git a/chrome/browser/chromeos/extensions/file_browser_private_api.h b/chrome/browser/chromeos/extensions/file_browser_private_api.h
index ea88ebf1c893cefe8040406bf43c67ffb1e99133..4f192b6c805c0fe69fdad3b27f5fb2d936a7a366 100644
--- a/chrome/browser/chromeos/extensions/file_browser_private_api.h
+++ b/chrome/browser/chromeos/extensions/file_browser_private_api.h
@@ -57,12 +57,12 @@ class FileBrowserPrivateAPI : public ProfileKeyedService {
// Convenience function to return the FileBrowserPrivateAPI for a Profile.
static FileBrowserPrivateAPI* Get(Profile* profile);
- scoped_refptr<FileBrowserEventRouter> event_router() {
- return event_router_;
+ FileBrowserEventRouter* event_router() {
+ return event_router_.get();
}
private:
- scoped_refptr<FileBrowserEventRouter> event_router_;
+ scoped_ptr<FileBrowserEventRouter> event_router_;
};
// Implements the chrome.fileBrowserPrivate.logoutUser method.
@@ -108,7 +108,7 @@ class FileWatchBrowserFunctionBase : public AsyncExtensionFunction {
virtual ~FileWatchBrowserFunctionBase() {}
virtual bool PerformFileWatchOperation(
- scoped_refptr<FileBrowserEventRouter> event_router,
+ FileBrowserEventRouter* event_router,
const base::FilePath& local_path, const base::FilePath& virtual_path,
const std::string& extension_id) = 0;
@@ -118,7 +118,7 @@ class FileWatchBrowserFunctionBase : public AsyncExtensionFunction {
private:
void RespondOnUIThread(bool success);
void RunFileWatchOperationOnFileThread(
- scoped_refptr<FileBrowserEventRouter> event_router,
+ FileBrowserEventRouter* event_router,
const fileapi::FileSystemURL& file_url,
const std::string& extension_id);
};
@@ -133,7 +133,7 @@ class AddFileWatchBrowserFunction : public FileWatchBrowserFunctionBase {
virtual ~AddFileWatchBrowserFunction() {}
virtual bool PerformFileWatchOperation(
- scoped_refptr<FileBrowserEventRouter> event_router,
+ FileBrowserEventRouter* event_router,
const base::FilePath& local_path, const base::FilePath& virtual_path,
const std::string& extension_id) OVERRIDE;
};
@@ -149,7 +149,7 @@ class RemoveFileWatchBrowserFunction : public FileWatchBrowserFunctionBase {
virtual ~RemoveFileWatchBrowserFunction() {}
virtual bool PerformFileWatchOperation(
- scoped_refptr<FileBrowserEventRouter> event_router,
+ FileBrowserEventRouter* event_router,
const base::FilePath& local_path, const base::FilePath& virtual_path,
const std::string& extension_id) OVERRIDE;
};

Powered by Google App Engine
This is Rietveld 408576698