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

Unified Diff: chrome/browser/ui/views/profiles/user_manager_view.cc

Issue 891173005: [Metro] Set a shelf icon for the user manager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/profiles/user_manager_view.cc
diff --git a/chrome/browser/ui/views/profiles/user_manager_view.cc b/chrome/browser/ui/views/profiles/user_manager_view.cc
index d781fb5c7b089f31e6803fa7d0d6aad1aa1e0a02..ad17c9b2a3d8232618a1bcc9ef55cb4cf7067786 100644
--- a/chrome/browser/ui/views/profiles/user_manager_view.cc
+++ b/chrome/browser/ui/views/profiles/user_manager_view.cc
@@ -34,6 +34,12 @@
#include "ui/views/win/hwnd_util.h"
#endif
+#if defined(USE_ASH)
+#include "ash/shelf/shelf_util.h"
+#include "ash/wm/window_util.h"
+#include "grit/ash_resources.h"
+#endif
+
namespace {
// An open User Manager window. There can only be one open at a time. This
@@ -153,6 +159,12 @@ void UserManagerView::Init(Profile* system_profile, const GURL& url) {
views::HWNDForWidget(GetWidget()));
#endif
+#if defined(USE_ASH)
+ gfx::NativeWindow native_window = GetWidget()->GetNativeWindow();
+ ash::SetShelfItemDetailsForDialogWindow(
+ native_window, IDR_ASH_SHELF_LIST_BROWSER, native_window->title());
+#endif
+
web_view_->LoadInitialURL(url);
content::RenderWidgetHostView* rwhv =
web_view_->GetWebContents()->GetRenderWidgetHostView();
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698