summaryrefslogtreecommitdiffstats
path: root/ash/ash_strings.grd
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-22 23:15:24 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-22 23:15:24 +0000
commita594c456d7272670afb2470b2f3148474bffe0a4 (patch)
tree75346a2c59a919eab9d15239674758bf265aa70b /ash/ash_strings.grd
parenta3805ce944aff2a11bc5f8b501b09322ddb1e434 (diff)
downloadchromium_src-a594c456d7272670afb2470b2f3148474bffe0a4.zip
chromium_src-a594c456d7272670afb2470b2f3148474bffe0a4.tar.gz
chromium_src-a594c456d7272670afb2470b2f3148474bffe0a4.tar.bz2
Revert 242286 "Implements the dialog view for logout confirmatio..."
Broke ash_unittests on the cros asan bot, starting here: http://build.chromium.org/p/chromium.memory/builders/Linux%20Chromium%20OS%20ASAN%20Tests%20%281%29/builds/14682 Example leaks: Indirect leak of 584 byte(s) in 1 object(s) allocated from: #0 0x48e7d9 in operator new(unsigned long) /usr/local/google/work/chromium/src/third_party/llvm/projects/compiler-rt/lib/asan/asan_new_delete.cc:52 #1 0x147ca2f in ash::internal::LogoutConfirmationDialogView::LogoutConfirmationDialogView(ash::internal::LogoutButtonTray*, ash::internal::LogoutConfirmationDialogView::Delegate*) ash/system/logout_button/logout_confirmation_dialog_view.cc:39 #2 0x147b683 in EnsureConfirmationDialogIsShowing ash/system/logout_button/logout_button_tray.cc:158 #3 0x147b683 in ash::internal::LogoutButtonTray::ButtonPressed(views::Button*, ui::Event const&) ash/system/logout_button/logout_button_tray.cc:204 #4 0x94e05f in ash::internal::LogoutConfirmationDialogTest::PressButton() ash/system/logout_button/logout_button_tray_unittest.cc:230 #5 0x953d63 in ash::internal::LogoutConfirmationDialogTest_UserClickedButton_Test::TestBody() ash/system/logout_button/logout_button_tray_unittest.cc:317 #6 0xf8b77a in testing::Test::Run() testing/gtest/src/gtest.cc:2061 #7 0xf8d77c in testing::TestInfo::Run() testing/gtest/src/gtest.cc:2237 #8 0xf8e6f2 in testing::TestCase::Run() testing/gtest/src/gtest.cc:2344 #9 0xf9f585 in testing::internal::UnitTestImpl::RunAllTests() testing/gtest/src/gtest.cc:4065 #10 0xf9eade in HandleExceptionsInMethodIfSupported\u003Ctesting::internal::UnitTestImpl, bool> testing/gtest/src/gtest.cc:2045 #11 0xf9eade in testing::UnitTest::Run() testing/gtest/src/gtest.cc:3697 #12 0xf4aa22 in RUN_ALL_TESTS testing/gtest/include/gtest/gtest.h:2231 #13 0xf4aa22 in base::TestSuite::Run() base/test/test_suite.cc:213 #14 0xf411ef in Run base/callback.h:401 #15 0xf411ef in base::(anonymous namespace)::LaunchUnitTestsInternal(int, char**, base::Callback\u003Cint ()> const&, int) base/test/launcher/unit_test_launcher.cc:505 #16 0x9a49f5 in main ash/test/ash_unittests.cc:12 #17 0x7fd291b1676c in __libc_start_main /build/buildd/eglibc-2.15/csu/libc-start.c:226 Indirect leak of 560 byte(s) in 1 object(s) allocated from: #0 0x48e7d9 in operator new(unsigned long) /usr/local/google/work/chromium/src/third_party/llvm/projects/compiler-rt/lib/asan/asan_new_delete.cc:52 #1 0x147b64f in EnsureConfirmationDialogIsShowing ash/system/logout_button/logout_button_tray.cc:158 #2 0x147b64f in ash::internal::LogoutButtonTray::ButtonPressed(views::Button*, ui::Event const&) ash/system/logout_button/logout_button_tray.cc:204 #3 0x94e05f in ash::internal::LogoutConfirmationDialogTest::PressButton() ash/system/logout_button/logout_button_tray_unittest.cc:230 #4 0x953d63 in ash::internal::LogoutConfirmationDialogTest_UserClickedButton_Test::TestBody() ash/system/logout_button/logout_button_tray_unittest.cc:317 #5 0xf8b77a in testing::Test::Run() testing/gtest/src/gtest.cc:2061 #6 0xf8d77c in testing::TestInfo::Run() testing/gtest/src/gtest.cc:2237 #7 0xf8e6f2 in testing::TestCase::Run() testing/gtest/src/gtest.cc:2344 #8 0xf9f585 in testing::internal::UnitTestImpl::RunAllTests() testing/gtest/src/gtest.cc:4065 #9 0xf9eade in HandleExceptionsInMethodIfSupported\u003Ctesting::internal::UnitTestImpl, bool> testing/gtest/src/gtest.cc:2045 #10 0xf9eade in testing::UnitTest::Run() testing/gtest/src/gtest.cc:3697 #11 0xf4aa22 in RUN_ALL_TESTS testing/gtest/include/gtest/gtest.h:2231 #12 0xf4aa22 in base::TestSuite::Run() base/test/test_suite.cc:213 #13 0xf411ef in Run base/callback.h:401 #14 0xf411ef in base::(anonymous namespace)::LaunchUnitTestsInternal(int, char**, base::Callback\u003Cint ()> const&, int) base/test/launcher/unit_test_launcher.cc:505 #15 0x9a49f5 in main ash/test/ash_unittests.cc:12 #16 0x7fd291b1676c in __libc_start_main /build/buildd/eglibc-2.15/csu/libc-start.c:226 > Implements the dialog view for logout confirmation dialog in public sessions. > > Implements ash::internal::LogoutConfirmationDialogView which is supposed > to be used by ash::internal::LogoutButtonTray. > > BUG=223846 > TEST=new unit test > > Review URL: https://codereview.chromium.org/40053002 TBR=binjin@chromium.org Review URL: https://codereview.chromium.org/116083003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242329 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/ash_strings.grd')
-rw-r--r--ash/ash_strings.grd13
1 files changed, 0 insertions, 13 deletions
diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd
index 29a64a6..289c8b1 100644
--- a/ash/ash_strings.grd
+++ b/ash/ash_strings.grd
@@ -585,19 +585,6 @@ Press Shift + Alt to switch.
Press Control Shift Q twice to quit.
</message>
- <message name="IDS_ASH_LOGOUT_CONFIRMATION_TITLE" desc="Dialog title for the logout confirmation dialog.">
- Exiting Session
- </message>
- <message name="IDS_ASH_LOGOUT_CONFIRMATION_WARNING" desc="The text for the logout confirmation dialog.">
- You will automatically be signed out in <ph name="LOGOUT_TIME_LEFT">$1<ex>5 seconds</ex></ph>.
- </message>
- <message name="IDS_ASH_LOGOUT_CONFIRMATION_WARNING_NOW" desc="The text for the logout confirmation dialog with no time left.">
- You will be signed out now.
- </message>
- <message name="IDS_ASH_LOGOUT_CONFIRMATION_BUTTON" desc="The text for okay button of the logout confirmation dialog.">
- Sign out now
- </message>
-
<!-- ChromeOS-specific strings -->
<if expr="pp_ifdef('chromeos')">
<part file="ash_chromeos_strings.grdp" />