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

Unified Diff: ash/display/window_tree_host_manager.cc

Issue 2383313002: Remove ash localization from display_manager.cc (Closed)
Patch Set: rebased Created 4 years, 2 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/display/window_tree_host_manager.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/window_tree_host_manager.cc
diff --git a/ash/display/window_tree_host_manager.cc b/ash/display/window_tree_host_manager.cc
index 284bf79d692869ef383697a618212e2738d15ddd..dc0f63d1e90b9bedfc89867396880f71d11f74d3 100644
--- a/ash/display/window_tree_host_manager.cc
+++ b/ash/display/window_tree_host_manager.cc
@@ -30,6 +30,7 @@
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "base/threading/thread_task_runner_handle.h"
+#include "grit/ash_strings.h"
#include "ui/aura/client/capture_client.h"
#include "ui/aura/client/focus_client.h"
#include "ui/aura/client/screen_position_client.h"
@@ -39,6 +40,7 @@
#include "ui/aura/window_tracker.h"
#include "ui/aura/window_tree_host.h"
#include "ui/base/ime/input_method_factory.h"
+#include "ui/base/l10n/l10n_util.h"
#include "ui/compositor/compositor.h"
#include "ui/display/display.h"
#include "ui/display/manager/display_layout.h"
@@ -802,6 +804,14 @@ ui::DisplayConfigurator* WindowTreeHostManager::display_configurator() {
}
#endif
+std::string WindowTreeHostManager::GetInternalDisplayNameString() {
+ return l10n_util::GetStringUTF8(IDS_ASH_INTERNAL_DISPLAY_NAME);
+}
+
+std::string WindowTreeHostManager::GetUnknownDisplayNameString() {
+ return l10n_util::GetStringUTF8(IDS_ASH_STATUS_TRAY_UNKNOWN_DISPLAY_NAME);
+}
+
ui::EventDispatchDetails WindowTreeHostManager::DispatchKeyEventPostIME(
ui::KeyEvent* event) {
// Getting the active root window to dispatch the event. This isn't
« no previous file with comments | « ash/display/window_tree_host_manager.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698