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

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

Issue 11358027: Move constrained web dialog code back to chrome/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cros fix2 Created 8 years, 1 month 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/extensions/extension_service.h" 9 #include "chrome/browser/extensions/extension_service.h"
10 #include "chrome/browser/extensions/extension_web_ui.h" 10 #include "chrome/browser/extensions/extension_web_ui.h"
11 #include "chrome/browser/history/history_types.h" 11 #include "chrome/browser/history/history_types.h"
12 #include "chrome/browser/prefs/pref_service.h" 12 #include "chrome/browser/prefs/pref_service.h"
13 #include "chrome/browser/printing/print_preview_tab_controller.h" 13 #include "chrome/browser/printing/print_preview_tab_controller.h"
14 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
15 #include "chrome/browser/profiles/profile_manager.h" 15 #include "chrome/browser/profiles/profile_manager.h"
16 #include "chrome/browser/ui/tab_contents/tab_contents.h" 16 #include "chrome/browser/ui/tab_contents/tab_contents.h"
17 #include "chrome/browser/ui/webui/about_ui.h" 17 #include "chrome/browser/ui/webui/about_ui.h"
18 #include "chrome/browser/ui/webui/bookmarks_ui.h" 18 #include "chrome/browser/ui/webui/bookmarks_ui.h"
19 #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h"
19 #include "chrome/browser/ui/webui/crashes_ui.h" 20 #include "chrome/browser/ui/webui/crashes_ui.h"
20 #include "chrome/browser/ui/webui/devtools_ui.h" 21 #include "chrome/browser/ui/webui/devtools_ui.h"
21 #include "chrome/browser/ui/webui/downloads_ui.h" 22 #include "chrome/browser/ui/webui/downloads_ui.h"
22 #include "chrome/browser/ui/webui/extensions/extension_activity_ui.h" 23 #include "chrome/browser/ui/webui/extensions/extension_activity_ui.h"
23 #include "chrome/browser/ui/webui/extensions/extension_info_ui.h" 24 #include "chrome/browser/ui/webui/extensions/extension_info_ui.h"
24 #include "chrome/browser/ui/webui/extensions/extensions_ui.h" 25 #include "chrome/browser/ui/webui/extensions/extensions_ui.h"
25 #include "chrome/browser/ui/webui/feedback_ui.h" 26 #include "chrome/browser/ui/webui/feedback_ui.h"
26 #include "chrome/browser/ui/webui/flags_ui.h" 27 #include "chrome/browser/ui/webui/flags_ui.h"
27 #include "chrome/browser/ui/webui/flash_ui.h" 28 #include "chrome/browser/ui/webui/flash_ui.h"
28 #include "chrome/browser/ui/webui/generic_handler.h" 29 #include "chrome/browser/ui/webui/generic_handler.h"
(...skipping 25 matching lines...) Expand all
54 #include "chrome/common/chrome_switches.h" 55 #include "chrome/common/chrome_switches.h"
55 #include "chrome/common/extensions/extension_constants.h" 56 #include "chrome/common/extensions/extension_constants.h"
56 #include "chrome/common/extensions/feature_switch.h" 57 #include "chrome/common/extensions/feature_switch.h"
57 #include "chrome/common/pref_names.h" 58 #include "chrome/common/pref_names.h"
58 #include "chrome/common/url_constants.h" 59 #include "chrome/common/url_constants.h"
59 #include "content/public/browser/web_contents.h" 60 #include "content/public/browser/web_contents.h"
60 #include "content/public/browser/web_ui.h" 61 #include "content/public/browser/web_ui.h"
61 #include "content/public/common/content_client.h" 62 #include "content/public/common/content_client.h"
62 #include "googleurl/src/gurl.h" 63 #include "googleurl/src/gurl.h"
63 #include "ui/gfx/favicon_size.h" 64 #include "ui/gfx/favicon_size.h"
64 #include "ui/web_dialogs/constrained_web_dialog_ui.h"
65 #include "ui/web_dialogs/web_dialog_ui.h" 65 #include "ui/web_dialogs/web_dialog_ui.h"
66 66
67 #if defined(OS_ANDROID) 67 #if defined(OS_ANDROID)
68 #include "chrome/browser/ui/webui/welcome_ui_android.h" 68 #include "chrome/browser/ui/webui/welcome_ui_android.h"
69 #else 69 #else
70 #include "chrome/browser/ui/webui/suggestions_internals/suggestions_internals_ui .h" 70 #include "chrome/browser/ui/webui/suggestions_internals/suggestions_internals_ui .h"
71 #include "chrome/browser/ui/webui/uber/uber_ui.h" 71 #include "chrome/browser/ui/webui/uber/uber_ui.h"
72 #endif 72 #endif
73 73
74 #if defined(OS_CHROMEOS) 74 #if defined(OS_CHROMEOS)
(...skipping 23 matching lines...) Expand all
98 #include "chrome/browser/ui/webui/conflicts_ui.h" 98 #include "chrome/browser/ui/webui/conflicts_ui.h"
99 #include "chrome/browser/ui/webui/set_as_default_browser_ui.h" 99 #include "chrome/browser/ui/webui/set_as_default_browser_ui.h"
100 #endif 100 #endif
101 101
102 #if (defined(USE_NSS) || defined(USE_OPENSSL)) && defined(USE_AURA) 102 #if (defined(USE_NSS) || defined(USE_OPENSSL)) && defined(USE_AURA)
103 #include "chrome/browser/ui/webui/certificate_viewer_ui.h" 103 #include "chrome/browser/ui/webui/certificate_viewer_ui.h"
104 #endif 104 #endif
105 105
106 using content::WebUI; 106 using content::WebUI;
107 using content::WebUIController; 107 using content::WebUIController;
108 using ui::ConstrainedWebDialogUI;
109 using ui::ExternalWebDialogUI; 108 using ui::ExternalWebDialogUI;
110 using ui::WebDialogUI; 109 using ui::WebDialogUI;
111 110
112 namespace { 111 namespace {
113 112
114 // A function for creating a new WebUI. The caller owns the return value, which 113 // A function for creating a new WebUI. The caller owns the return value, which
115 // may be NULL (for example, if the URL refers to an non-existent extension). 114 // may be NULL (for example, if the URL refers to an non-existent extension).
116 typedef WebUIController* (*WebUIFactoryFunction)(WebUI* web_ui, 115 typedef WebUIController* (*WebUIFactoryFunction)(WebUI* web_ui,
117 const GURL& url); 116 const GURL& url);
118 117
(...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after
593 if (page_url.host() == chrome::kChromeUISettingsFrameHost) 592 if (page_url.host() == chrome::kChromeUISettingsFrameHost)
594 return options::OptionsUI::GetFaviconResourceBytes(scale_factor); 593 return options::OptionsUI::GetFaviconResourceBytes(scale_factor);
595 594
596 // Android doesn't use the plugins pages. 595 // Android doesn't use the plugins pages.
597 if (page_url.host() == chrome::kChromeUIPluginsHost) 596 if (page_url.host() == chrome::kChromeUIPluginsHost)
598 return PluginsUI::GetFaviconResourceBytes(scale_factor); 597 return PluginsUI::GetFaviconResourceBytes(scale_factor);
599 #endif 598 #endif
600 599
601 return NULL; 600 return NULL;
602 } 601 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/certificate_viewer_webui.cc ('k') | chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698