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

Unified Diff: ash/mus/root_window_controller.cc

Issue 2112403002: NOSUBMIT: Initialize a StatusAreaWidget inside ash wm (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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/mus/bridge/wm_shell_mus.cc ('k') | ash/mus/window_manager_application.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/root_window_controller.cc
diff --git a/ash/mus/root_window_controller.cc b/ash/mus/root_window_controller.cc
index 46b52128e12c0cd7eb7c42ad54da13fd1bca0b25..b14865ef10bd3b76a5edc5559b1cb5fb0b4f1521 100644
--- a/ash/mus/root_window_controller.cc
+++ b/ash/mus/root_window_controller.cc
@@ -6,6 +6,7 @@
#include <stdint.h>
+#include <algorithm>
#include <map>
#include <sstream>
@@ -43,6 +44,9 @@
#include "services/shell/public/cpp/connector.h"
#include "ui/display/mojo/display_type_converters.h"
+//JAMES hack
+#include "ash/system/status_area_widget.h"
+
using ash::mojom::Container;
namespace ash {
@@ -206,6 +210,16 @@ void RootWindowController::OnShelfWindowAvailable() {
// DockedWindowLayoutManagerObserver so that it can inset by the docked
// windows.
// docked_layout_manager_->AddObserver(shelf_->shelf_layout_manager());
+
+ //JAMES hack
+ LOG(ERROR) << "JAMES creating status area widget";
+ WmWindowMus* status_container =
+ GetWindowByShellWindowId(kShellWindowId_StatusContainer);
+ StatusAreaWidget* status_area_widget =
+ new StatusAreaWidget(status_container, wm_shelf_.get());
+ status_area_widget->CreateTrayViews();
+ status_area_widget->SetBounds(gfx::Rect(200, 300, 150, 250));
+ status_area_widget->Show();
}
void RootWindowController::CreateLayoutManagers() {
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.cc ('k') | ash/mus/window_manager_application.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698