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

Unified Diff: chrome/browser/ui/browser.cc

Issue 9665031: Change the idle logout dialog over to use views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 9 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/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 97dd65d45989d1a9a0ab1cd83e392089c56b4a4e..7b623aef2295ab2a8bdea95627a69e20d1cf7989 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -206,6 +206,7 @@
#include "chrome/browser/chromeos/boot_times_loader.h"
#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
#include "chrome/browser/chromeos/dbus/power_manager_client.h"
+#include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h"
#if defined(USE_AURA)
#include "chrome/browser/extensions/api/terminal/terminal_extension_helper.h"
#endif
@@ -2221,7 +2222,10 @@ void Browser::OpenTaskManager(bool highlight_background_resources) {
void Browser::OpenFeedbackDialog() {
content::RecordAction(UserMetricsAction("Feedback"));
- browser::ShowHtmlFeedbackView(this, std::string(), std::string());
+// browser::ShowHtmlFeedbackView(this, std::string(), std::string());
+ browser::ShowIdleLogoutDialog();
+ browser::CloseIdleLogoutDialog();
+ browser::ShowIdleLogoutDialog();
}
void Browser::ToggleBookmarkBar() {

Powered by Google App Engine
This is Rietveld 408576698