chrome/browser/ui/ash/launcher/browser_status_monitor.cc - Issue 507003002: Set the shelf icon title explicitly for settings and task manager

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/ash/launcher/browser_status_monitor.cc

Issue 507003002: Set the shelf icon title explicitly for settings and task manager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 4 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/ash/launcher/browser_status_monitor.cc

diff --git a/chrome/browser/ui/ash/launcher/browser_status_monitor.cc b/chrome/browser/ui/ash/launcher/browser_status_monitor.cc

index 17c3e0c1f63b5ece59cb9afce3570131459d030b..93f6ef12979aeebada000a1b12bd126319305821 100644

--- a/chrome/browser/ui/ash/launcher/browser_status_monitor.cc

+++ b/chrome/browser/ui/ash/launcher/browser_status_monitor.cc

@@ -21,8 +21,10 @@

#include "content/public/browser/web_contents.h"

#include "content/public/browser/web_contents_observer.h"

#include "grit/ash_resources.h"

+#include "grit/generated_resources.h"

#include "ui/aura/window.h"

#include "ui/aura/window_event_dispatcher.h"

+#include "ui/base/l10n/l10n_util.h"

#include "ui/gfx/screen.h"

#include "ui/wm/public/activation_client.h"

@@ -84,7 +86,8 @@ class BrowserStatusMonitor::SettingsWindowObserver

virtual void OnNewSettingsWindow(Browser* settings_browser) OVERRIDE {

ash::SetShelfItemDetailsForDialogWindow(

settings_browser->window()->GetNativeWindow(),

- IDR_ASH_SHELF_ICON_SETTINGS);

+ IDR_ASH_SHELF_ICON_SETTINGS,

+ l10n_util::GetStringUTF16(IDS_SETTINGS_TITLE));

}

private:

« no previous file with comments | « ash/shelf/shelf_util.cc ('k') | chrome/browser/ui/ash/launcher/multi_profile_browser_status_monitor.cc » ('j') | no next file with comments »