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

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

Issue 2332393003: mash: Remove shelf util functions; use WmWindow properties. (Closed)
Patch Set: Address comments. Created 4 years, 3 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: 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 5a1a2a809d20e068cdd64007eab69b84c4bf8269..f7c9a67a89f56a5eae7e2170dcda4b33d7b774b1 100644
--- a/chrome/browser/ui/views/profiles/user_manager_view.cc
+++ b/chrome/browser/ui/views/profiles/user_manager_view.cc
@@ -45,12 +45,6 @@
#include "ui/views/win/hwnd_util.h"
#endif
-#if defined(USE_ASH)
-#include "ash/resources/grit/ash_resources.h" // nogncheck
-#include "ash/shelf/shelf_util.h" // nogncheck
-#include "ash/wm/window_util.h" // nogncheck
-#endif
-
namespace {
// An open User Manager window. There can only be one open at a time. This
@@ -242,10 +236,8 @@ UserManagerView::UserManagerView()
: web_view_(nullptr),
delegate_(nullptr),
user_manager_started_showing_(base::Time()) {
-#if !defined(USE_ASH)
keep_alive_.reset(new ScopedKeepAlive(KeepAliveOrigin::USER_MANAGER_VIEW,
KeepAliveRestartOption::DISABLED));
-#endif // !defined(USE_ASH)
}
UserManagerView::~UserManagerView() {
@@ -353,12 +345,6 @@ 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 | « chrome/browser/ui/ash/launcher/multi_profile_browser_status_monitor.cc ('k') | chrome/browser/ui/views/task_manager_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698