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

Unified Diff: chrome/browser/chromeos/login/ui/webui_login_view.cc

Issue 2550263002: cros: Ensure task manager shows correct title for lock screen webview (Closed)
Patch Set: Rebase Created 4 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 | « chrome/browser/chromeos/login/ui/webui_login_view.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/ui/webui_login_view.cc
diff --git a/chrome/browser/chromeos/login/ui/webui_login_view.cc b/chrome/browser/chromeos/login/ui/webui_login_view.cc
index 963449226cba471b3bd89464223d1f3c19ff314b..3cc07a5321bd0d417f86eee2aed56a3c4c6903ce 100644
--- a/chrome/browser/chromeos/login/ui/webui_login_view.cc
+++ b/chrome/browser/chromeos/login/ui/webui_login_view.cc
@@ -24,6 +24,7 @@
#include "chrome/browser/chromeos/login/ui/proxy_settings_dialog.h"
#include "chrome/browser/chromeos/login/ui/shared_web_view.h"
#include "chrome/browser/chromeos/login/ui/shared_web_view_factory.h"
+#include "chrome/browser/chromeos/login/ui/web_contents_forced_title.h"
#include "chrome/browser/chromeos/login/ui/web_contents_set_background_color.h"
#include "chrome/browser/chromeos/login/ui/web_view_handle.h"
#include "chrome/browser/chromeos/login/ui/webui_login_display.h"
@@ -269,9 +270,13 @@ WebUILoginView::~WebUILoginView() {
}
// static
-void WebUILoginView::InitializeWebView(views::WebView* web_view) {
+void WebUILoginView::InitializeWebView(views::WebView* web_view,
+ const base::string16& title) {
WebContents* web_contents = web_view->GetWebContents();
+ if (!title.empty())
+ WebContentsForcedTitle::CreateForWebContentsWithTitle(web_contents, title);
+
WebContentsSetBackgroundColor::CreateForWebContentsWithColor(
web_contents, SK_ColorTRANSPARENT);
@@ -311,7 +316,7 @@ void WebUILoginView::Init() {
WebContents* web_contents = web_view()->GetWebContents();
if (!is_reusing_webview_)
- InitializeWebView(web_view());
+ InitializeWebView(web_view(), settings_.web_view_title);
web_view()->set_allow_accelerators(true);
AddChildView(web_view());
« no previous file with comments | « chrome/browser/chromeos/login/ui/webui_login_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698