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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/browser.h" 5 #include "chrome/browser/ui/browser.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #include <shellapi.h> 9 #include <shellapi.h>
10 #endif // OS_WIN 10 #endif // OS_WIN
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 #endif // OS_WIN 199 #endif // OS_WIN
200 200
201 #if defined(OS_MACOSX) 201 #if defined(OS_MACOSX)
202 #include "ui/base/cocoa/find_pasteboard.h" 202 #include "ui/base/cocoa/find_pasteboard.h"
203 #endif 203 #endif
204 204
205 #if defined(OS_CHROMEOS) 205 #if defined(OS_CHROMEOS)
206 #include "chrome/browser/chromeos/boot_times_loader.h" 206 #include "chrome/browser/chromeos/boot_times_loader.h"
207 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h" 207 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
208 #include "chrome/browser/chromeos/dbus/power_manager_client.h" 208 #include "chrome/browser/chromeos/dbus/power_manager_client.h"
209 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h"
209 #if defined(USE_AURA) 210 #if defined(USE_AURA)
210 #include "chrome/browser/extensions/api/terminal/terminal_extension_helper.h" 211 #include "chrome/browser/extensions/api/terminal/terminal_extension_helper.h"
211 #endif 212 #endif
212 #include "chrome/browser/ui/webui/active_downloads_ui.h" 213 #include "chrome/browser/ui/webui/active_downloads_ui.h"
213 #endif 214 #endif
214 215
215 #if defined(USE_AURA) 216 #if defined(USE_AURA)
216 #include "ash/ash_switches.h" 217 #include "ash/ash_switches.h"
217 #include "ash/shell.h" 218 #include "ash/shell.h"
218 #include "chrome/browser/ui/views/ash/panel_view_aura.h" 219 #include "chrome/browser/ui/views/ash/panel_view_aura.h"
(...skipping 1995 matching lines...) Expand 10 before | Expand all | Expand 10 after
2214 void Browser::OpenTaskManager(bool highlight_background_resources) { 2215 void Browser::OpenTaskManager(bool highlight_background_resources) {
2215 content::RecordAction(UserMetricsAction("TaskManager")); 2216 content::RecordAction(UserMetricsAction("TaskManager"));
2216 if (highlight_background_resources) 2217 if (highlight_background_resources)
2217 window_->ShowBackgroundPages(); 2218 window_->ShowBackgroundPages();
2218 else 2219 else
2219 window_->ShowTaskManager(); 2220 window_->ShowTaskManager();
2220 } 2221 }
2221 2222
2222 void Browser::OpenFeedbackDialog() { 2223 void Browser::OpenFeedbackDialog() {
2223 content::RecordAction(UserMetricsAction("Feedback")); 2224 content::RecordAction(UserMetricsAction("Feedback"));
2224 browser::ShowHtmlFeedbackView(this, std::string(), std::string()); 2225 // browser::ShowHtmlFeedbackView(this, std::string(), std::string());
2226 browser::ShowIdleLogoutDialog();
2227 browser::CloseIdleLogoutDialog();
2228 browser::ShowIdleLogoutDialog();
2225 } 2229 }
2226 2230
2227 void Browser::ToggleBookmarkBar() { 2231 void Browser::ToggleBookmarkBar() {
2228 content::RecordAction(UserMetricsAction("ShowBookmarksBar")); 2232 content::RecordAction(UserMetricsAction("ShowBookmarksBar"));
2229 window_->ToggleBookmarkBar(); 2233 window_->ToggleBookmarkBar();
2230 } 2234 }
2231 2235
2232 void Browser::OpenBookmarkManager() { 2236 void Browser::OpenBookmarkManager() {
2233 content::RecordAction(UserMetricsAction("ShowBookmarkManager")); 2237 content::RecordAction(UserMetricsAction("ShowBookmarkManager"));
2234 content::RecordAction(UserMetricsAction("ShowBookmarks")); 2238 content::RecordAction(UserMetricsAction("ShowBookmarks"));
(...skipping 3411 matching lines...) Expand 10 before | Expand all | Expand 10 after
5646 ShowSingletonTabOverwritingNTP(params); 5650 ShowSingletonTabOverwritingNTP(params);
5647 } else { 5651 } else {
5648 LoginUIServiceFactory::GetForProfile( 5652 LoginUIServiceFactory::GetForProfile(
5649 profile()->GetOriginalProfile())->ShowLoginUI(); 5653 profile()->GetOriginalProfile())->ShowLoginUI();
5650 } 5654 }
5651 } 5655 }
5652 5656
5653 void Browser::ToggleSpeechInput() { 5657 void Browser::ToggleSpeechInput() {
5654 GetSelectedWebContents()->GetRenderViewHost()->ToggleSpeechInput(); 5658 GetSelectedWebContents()->GetRenderViewHost()->ToggleSpeechInput();
5655 } 5659 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698