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

Unified Diff: blimp/client/app/linux/blimp_main.cc

Issue 2349073002: Blimp Settings framework on the c++ side (Closed)
Patch Set: Merge branch 'refs/heads/master' into settings Created 4 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 side-by-side diff with in-line comments
Download patch
Index: blimp/client/app/linux/blimp_main.cc
diff --git a/blimp/client/app/linux/blimp_main.cc b/blimp/client/app/linux/blimp_main.cc
index 2f06d931953f8610e13822bcce2b2bd6a73ad227..d84f1b5dabfd26fac16480e15c63f926f1e0ebf1 100644
--- a/blimp/client/app/linux/blimp_main.cc
+++ b/blimp/client/app/linux/blimp_main.cc
@@ -47,11 +47,12 @@ int main(int argc, const char**argv) {
// destroyed before the delegate.
std::unique_ptr<blimp::client::BlimpClientContextDelegate> context_delegate =
base::MakeUnique<blimp::client::BlimpClientContextDelegateLinux>();
- std::unique_ptr<blimp::client::BlimpClientContext> context =
- base::WrapUnique<blimp::client::BlimpClientContext>(
- blimp::client::BlimpClientContext::Create(
- io_thread.task_runner(), io_thread.task_runner(),
- base::WrapUnique(compositor_dependencies)));
+ auto context = base::WrapUnique<blimp::client::BlimpClientContext>(
+ blimp::client::BlimpClientContext::Create(
+ io_thread.task_runner(), io_thread.task_runner(),
+ base::WrapUnique(compositor_dependencies),
+ static_cast<blimp::client::BlimpClientContextDelegateLinux*>(
+ context_delegate.get())->pref_service()));
context->SetDelegate(context_delegate.get());
context->Connect();

Powered by Google App Engine
This is Rietveld 408576698