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

Side by Side Diff: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

Issue 9665031: Change the idle logout dialog over to use views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: yacf. 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/webui/chrome_web_ui_controller_factory.h" 5 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "chrome/browser/about_flags.h" 8 #include "chrome/browser/about_flags.h"
9 #include "chrome/browser/browser_process.h" 9 #include "chrome/browser/browser_process.h"
10 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 #include "chrome/common/extensions/extension_constants.h" 52 #include "chrome/common/extensions/extension_constants.h"
53 #include "chrome/common/pref_names.h" 53 #include "chrome/common/pref_names.h"
54 #include "chrome/common/url_constants.h" 54 #include "chrome/common/url_constants.h"
55 #include "content/public/browser/web_contents.h" 55 #include "content/public/browser/web_contents.h"
56 #include "content/public/browser/web_ui.h" 56 #include "content/public/browser/web_ui.h"
57 #include "googleurl/src/gurl.h" 57 #include "googleurl/src/gurl.h"
58 58
59 #if defined(OS_CHROMEOS) 59 #if defined(OS_CHROMEOS)
60 #include "chrome/browser/ui/webui/chromeos/active_downloads_ui.h" 60 #include "chrome/browser/ui/webui/chromeos/active_downloads_ui.h"
61 #include "chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.h" 61 #include "chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.h"
62 #include "chrome/browser/ui/webui/chromeos/idle_logout_dialog.h"
63 #include "chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.h" 62 #include "chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.h"
64 #include "chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.h" 63 #include "chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.h"
65 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 64 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
66 #include "chrome/browser/ui/webui/chromeos/mobile_setup_ui.h" 65 #include "chrome/browser/ui/webui/chromeos/mobile_setup_ui.h"
67 #include "chrome/browser/ui/webui/chromeos/proxy_settings_ui.h" 66 #include "chrome/browser/ui/webui/chromeos/proxy_settings_ui.h"
68 #include "chrome/browser/ui/webui/chromeos/register_page_ui.h" 67 #include "chrome/browser/ui/webui/chromeos/register_page_ui.h"
69 #include "chrome/browser/ui/webui/chromeos/sim_unlock_ui.h" 68 #include "chrome/browser/ui/webui/chromeos/sim_unlock_ui.h"
70 #include "chrome/browser/ui/webui/chromeos/system_info_ui.h" 69 #include "chrome/browser/ui/webui/chromeos/system_info_ui.h"
71 #endif 70 #endif
72 71
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 #endif 242 #endif
244 #if (defined(USE_NSS) || defined(USE_OPENSSL)) && defined(USE_AURA) 243 #if (defined(USE_NSS) || defined(USE_OPENSSL)) && defined(USE_AURA)
245 if (url.host() == chrome::kChromeUICertificateViewerHost) 244 if (url.host() == chrome::kChromeUICertificateViewerHost)
246 return &NewWebUI<CertificateViewerUI>; 245 return &NewWebUI<CertificateViewerUI>;
247 #endif 246 #endif
248 #if defined(OS_CHROMEOS) 247 #if defined(OS_CHROMEOS)
249 if (url.host() == chrome::kChromeUIActiveDownloadsHost) 248 if (url.host() == chrome::kChromeUIActiveDownloadsHost)
250 return &NewWebUI<ActiveDownloadsUI>; 249 return &NewWebUI<ActiveDownloadsUI>;
251 if (url.host() == chrome::kChromeUIChooseMobileNetworkHost) 250 if (url.host() == chrome::kChromeUIChooseMobileNetworkHost)
252 return &NewWebUI<chromeos::ChooseMobileNetworkUI>; 251 return &NewWebUI<chromeos::ChooseMobileNetworkUI>;
253 if (url.host() == chrome::kChromeUIIdleLogoutDialogHost)
254 return &NewWebUI<IdleLogoutDialogUI>;
255 if (url.host() == chrome::kChromeUIImageBurnerHost) 252 if (url.host() == chrome::kChromeUIImageBurnerHost)
256 return &NewWebUI<ImageBurnUI>; 253 return &NewWebUI<ImageBurnUI>;
257 if (url.host() == chrome::kChromeUIKeyboardOverlayHost) 254 if (url.host() == chrome::kChromeUIKeyboardOverlayHost)
258 return &NewWebUI<KeyboardOverlayUI>; 255 return &NewWebUI<KeyboardOverlayUI>;
259 if (url.host() == chrome::kChromeUIMobileSetupHost) 256 if (url.host() == chrome::kChromeUIMobileSetupHost)
260 return &NewWebUI<MobileSetupUI>; 257 return &NewWebUI<MobileSetupUI>;
261 if (url.host() == chrome::kChromeUIOobeHost) 258 if (url.host() == chrome::kChromeUIOobeHost)
262 return &NewWebUI<chromeos::OobeUI>; 259 return &NewWebUI<chromeos::OobeUI>;
263 if (url.host() == chrome::kChromeUIProxySettingsHost) 260 if (url.host() == chrome::kChromeUIProxySettingsHost)
264 return &NewWebUI<chromeos::ProxySettingsUI>; 261 return &NewWebUI<chromeos::ProxySettingsUI>;
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
498 495
499 if (page_url.host() == chrome::kChromeUISettingsFrameHost) 496 if (page_url.host() == chrome::kChromeUISettingsFrameHost)
500 return options2::OptionsUI::GetFaviconResourceBytes(); 497 return options2::OptionsUI::GetFaviconResourceBytes();
501 #endif 498 #endif
502 499
503 if (page_url.host() == chrome::kChromeUIPluginsHost) 500 if (page_url.host() == chrome::kChromeUIPluginsHost)
504 return PluginsUI::GetFaviconResourceBytes(); 501 return PluginsUI::GetFaviconResourceBytes();
505 502
506 return NULL; 503 return NULL;
507 } 504 }
OLDNEW
« no previous file with comments | « chrome/browser/resources/chromeos/idle_logout_dialog.js ('k') | chrome/browser/ui/webui/chromeos/idle_logout_dialog.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698