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

Unified Diff: ash/shell/content_client/shell_browser_main_parts.cc

Issue 273073002: Changes code using Compositor to pass in ContextFactory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix tooltip on chromeos Created 6 years, 7 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
« no previous file with comments | « ash/shell.cc ('k') | ash/shell/window_watcher_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell/content_client/shell_browser_main_parts.cc
diff --git a/ash/shell/content_client/shell_browser_main_parts.cc b/ash/shell/content_client/shell_browser_main_parts.cc
index 8c2a37a3e3f75056727a3d9e613fe8cabcead959..9460486a4875842642d3c38a86633ba119e300e6 100644
--- a/ash/shell/content_client/shell_browser_main_parts.cc
+++ b/ash/shell/content_client/shell_browser_main_parts.cc
@@ -18,6 +18,7 @@
#include "base/strings/string_number_conversions.h"
#include "base/threading/thread.h"
#include "base/threading/thread_restrictions.h"
+#include "content/public/browser/context_factory.h"
#include "content/public/common/content_switches.h"
#include "content/shell/browser/shell_browser_context.h"
#include "content/shell/browser/shell_net_log.h"
@@ -108,8 +109,10 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() {
false, net_log_.get()));
// A ViewsDelegate is required.
- if (!views::ViewsDelegate::views_delegate)
- views::ViewsDelegate::views_delegate = new ShellViewsDelegate;
+ if (!views::ViewsDelegate::views_delegate) {
+ ShellViewsDelegate* views_delegate = new ShellViewsDelegate;
+ views_delegate->set_context_factory(content::GetContextFactory());
+ }
delegate_ = new ash::shell::ShellDelegateImpl;
// The global message center state must be initialized absent
« no previous file with comments | « ash/shell.cc ('k') | ash/shell/window_watcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698