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

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

Issue 105813013: Adds views::corewm::WMState to install common state (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix viewseventtestbase Created 7 years 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/content_client/shell_browser_main_parts.h ('k') | ash/shell/shell_main.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 70d523efc4bb7238446125892842a1d8622f38f3..2e4a4c402003948724da9850239a43e095e9252a 100644
--- a/ash/shell/content_client/shell_browser_main_parts.cc
+++ b/ash/shell/content_client/shell_browser_main_parts.cc
@@ -29,6 +29,7 @@
#include "ui/compositor/compositor.h"
#include "ui/gfx/screen.h"
#include "ui/message_center/message_center.h"
+#include "ui/views/corewm/wm_state.h"
#include "ui/views/focus/accelerator_handler.h"
#include "ui/views/test/test_views_delegate.h"
@@ -97,6 +98,10 @@ void ShellBrowserMainParts::PostMainMessageLoopStart() {
#endif
}
+void ShellBrowserMainParts::ToolkitInitialized() {
+ wm_state_.reset(new views::corewm::WMState);
+}
+
void ShellBrowserMainParts::PreMainMessageLoopRun() {
net_log_.reset(new content::ShellNetLog());
browser_context_.reset(new content::ShellBrowserContext(
« no previous file with comments | « ash/shell/content_client/shell_browser_main_parts.h ('k') | ash/shell/shell_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698