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

Unified Diff: content/browser/dom_storage/dom_storage_context_wrapper.cc

Issue 1882423004: Move shell service to toplevel shell namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 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: content/browser/dom_storage/dom_storage_context_wrapper.cc
diff --git a/content/browser/dom_storage/dom_storage_context_wrapper.cc b/content/browser/dom_storage/dom_storage_context_wrapper.cc
index 7d2e19f863d877b8854b05f08f40d394597c6e93..83d699dab9f02be8e0ad5ff1838d1c9402b3f18b 100644
--- a/content/browser/dom_storage/dom_storage_context_wrapper.cc
+++ b/content/browser/dom_storage/dom_storage_context_wrapper.cc
@@ -80,7 +80,7 @@ void GetSessionStorageUsageHelper(
// for now).
class DOMStorageContextWrapper::MojoState {
public:
- MojoState(mojo::Connector* connector, const base::FilePath& subdirectory)
+ MojoState(shell::Connector* connector, const base::FilePath& subdirectory)
: connector_(connector),
subdirectory_(subdirectory),
connection_state_(NO_CONNECTION),
@@ -109,7 +109,7 @@ class DOMStorageContextWrapper::MojoState {
// Maps between an origin and its prefixed LevelDB view.
std::map<url::Origin, std::unique_ptr<LevelDBWrapperImpl>> level_db_wrappers_;
- mojo::Connector* const connector_;
+ shell::Connector* const connector_;
const base::FilePath subdirectory_;
enum ConnectionState {
@@ -118,7 +118,7 @@ class DOMStorageContextWrapper::MojoState {
CONNECTION_FINISHED
} connection_state_;
- std::unique_ptr<mojo::Connection> user_service_connection_;
+ std::unique_ptr<shell::Connection> user_service_connection_;
user_service::mojom::UserServicePtr user_service_;
filesystem::DirectoryPtr directory_;
@@ -232,7 +232,7 @@ void DOMStorageContextWrapper::MojoState::BindLocalStorage(
}
DOMStorageContextWrapper::DOMStorageContextWrapper(
- mojo::Connector* connector,
+ shell::Connector* connector,
const base::FilePath& profile_path,
const base::FilePath& local_partition_path,
storage::SpecialStoragePolicy* special_storage_policy) {
« no previous file with comments | « content/browser/dom_storage/dom_storage_context_wrapper.h ('k') | content/browser/frame_host/frame_mojo_shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698