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

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

Issue 13652010: Add a virtual keyboard webui at chrome://keyboard/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: build fix Created 7 years, 8 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
« no previous file with comments | « chrome/browser/extensions/image_loader.cc ('k') | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/location.h" 9 #include "base/location.h"
10 #include "base/message_loop_proxy.h" 10 #include "base/message_loop_proxy.h"
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 #include "chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.h" 91 #include "chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.h"
92 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 92 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
93 #include "chrome/browser/ui/webui/chromeos/mobile_setup_ui.h" 93 #include "chrome/browser/ui/webui/chromeos/mobile_setup_ui.h"
94 #include "chrome/browser/ui/webui/chromeos/proxy_settings_ui.h" 94 #include "chrome/browser/ui/webui/chromeos/proxy_settings_ui.h"
95 #include "chrome/browser/ui/webui/chromeos/sim_unlock_ui.h" 95 #include "chrome/browser/ui/webui/chromeos/sim_unlock_ui.h"
96 #include "chrome/browser/ui/webui/chromeos/system_info_ui.h" 96 #include "chrome/browser/ui/webui/chromeos/system_info_ui.h"
97 #endif 97 #endif
98 98
99 #if defined(USE_AURA) 99 #if defined(USE_AURA)
100 #include "chrome/browser/ui/webui/gesture_config_ui.h" 100 #include "chrome/browser/ui/webui/gesture_config_ui.h"
101 #include "ui/keyboard/keyboard_constants.h"
102 #include "ui/keyboard/keyboard_ui_controller.h"
101 #endif 103 #endif
102 104
103 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) 105 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
104 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" 106 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"
105 #endif 107 #endif
106 108
107 #if defined(OS_WIN) 109 #if defined(OS_WIN)
108 #include "chrome/browser/ui/webui/conflicts_ui.h" 110 #include "chrome/browser/ui/webui/conflicts_ui.h"
109 #include "chrome/browser/ui/webui/set_as_default_browser_ui.h" 111 #include "chrome/browser/ui/webui/set_as_default_browser_ui.h"
110 #endif 112 #endif
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 352
351 #if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) 353 #if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
352 if (url.host() == chrome::kChromeUITabModalConfirmDialogHost) { 354 if (url.host() == chrome::kChromeUITabModalConfirmDialogHost) {
353 return &NewWebUI<ConstrainedWebDialogUI>; 355 return &NewWebUI<ConstrainedWebDialogUI>;
354 } 356 }
355 #endif 357 #endif
356 358
357 #if defined(USE_AURA) 359 #if defined(USE_AURA)
358 if (url.host() == chrome::kChromeUIGestureConfigHost) 360 if (url.host() == chrome::kChromeUIGestureConfigHost)
359 return &NewWebUI<GestureConfigUI>; 361 return &NewWebUI<GestureConfigUI>;
362 if (url.host() == keyboard::kKeyboardWebUIHost)
363 return &NewWebUI<keyboard::KeyboardUIController>;
360 #endif 364 #endif
361 365
362 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) 366 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
363 if (url.host() == chrome::kChromeUISyncPromoHost) { 367 if (url.host() == chrome::kChromeUISyncPromoHost) {
364 // If the sync promo page is enabled then use the sync promo WebUI otherwise 368 // If the sync promo page is enabled then use the sync promo WebUI otherwise
365 // use the NTP WebUI. We don't want to return NULL if the sync promo page 369 // use the NTP WebUI. We don't want to return NULL if the sync promo page
366 // is disabled because the page can be disabled mid-flight (for example, 370 // is disabled because the page can be disabled mid-flight (for example,
367 // if sync login finishes). 371 // if sync login finishes).
368 if (SyncPromoUI::ShouldShowSyncPromo(profile)) 372 if (SyncPromoUI::ShouldShowSyncPromo(profile))
369 return &NewWebUI<SyncPromoUI>; 373 return &NewWebUI<SyncPromoUI>;
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
570 if (page_url.host() == chrome::kChromeUISettingsFrameHost) 574 if (page_url.host() == chrome::kChromeUISettingsFrameHost)
571 return options::OptionsUI::GetFaviconResourceBytes(scale_factor); 575 return options::OptionsUI::GetFaviconResourceBytes(scale_factor);
572 576
573 // Android doesn't use the plugins pages. 577 // Android doesn't use the plugins pages.
574 if (page_url.host() == chrome::kChromeUIPluginsHost) 578 if (page_url.host() == chrome::kChromeUIPluginsHost)
575 return PluginsUI::GetFaviconResourceBytes(scale_factor); 579 return PluginsUI::GetFaviconResourceBytes(scale_factor);
576 #endif 580 #endif
577 581
578 return NULL; 582 return NULL;
579 } 583 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/image_loader.cc ('k') | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698