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

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

Issue 15021020: content: Extract url utility functions into url_utils.{h,cc} (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix content_unittests and content_browsertests Created 7 years, 7 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/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/message_loop_proxy.h" 10 #include "base/message_loop/message_loop_proxy.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 #include "chrome/browser/ui/webui/user_actions/user_actions_ui.h" 51 #include "chrome/browser/ui/webui/user_actions/user_actions_ui.h"
52 #include "chrome/browser/ui/webui/version_ui.h" 52 #include "chrome/browser/ui/webui/version_ui.h"
53 #include "chrome/common/chrome_switches.h" 53 #include "chrome/common/chrome_switches.h"
54 #include "chrome/common/extensions/extension_constants.h" 54 #include "chrome/common/extensions/extension_constants.h"
55 #include "chrome/common/extensions/feature_switch.h" 55 #include "chrome/common/extensions/feature_switch.h"
56 #include "chrome/common/pref_names.h" 56 #include "chrome/common/pref_names.h"
57 #include "chrome/common/url_constants.h" 57 #include "chrome/common/url_constants.h"
58 #include "content/public/browser/web_contents.h" 58 #include "content/public/browser/web_contents.h"
59 #include "content/public/browser/web_ui.h" 59 #include "content/public/browser/web_ui.h"
60 #include "content/public/common/content_client.h" 60 #include "content/public/common/content_client.h"
61 #include "content/public/common/url_utils.h"
61 #include "extensions/common/constants.h" 62 #include "extensions/common/constants.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/web_dialog_ui.h" 65 #include "ui/web_dialogs/web_dialog_ui.h"
65 66
66 #if !defined(DISABLE_NACL) 67 #if !defined(DISABLE_NACL)
67 #include "chrome/browser/ui/webui/nacl_ui.h" 68 #include "chrome/browser/ui/webui/nacl_ui.h"
68 #endif 69 #endif
69 70
70 #if defined(ENABLE_CONFIGURATION_POLICY) 71 #if defined(ENABLE_CONFIGURATION_POLICY)
(...skipping 512 matching lines...) Expand 10 before | Expand all | Expand 10 after
583 if (page_url.host() == chrome::kChromeUISettingsFrameHost) 584 if (page_url.host() == chrome::kChromeUISettingsFrameHost)
584 return options::OptionsUI::GetFaviconResourceBytes(scale_factor); 585 return options::OptionsUI::GetFaviconResourceBytes(scale_factor);
585 586
586 // Android doesn't use the plugins pages. 587 // Android doesn't use the plugins pages.
587 if (page_url.host() == chrome::kChromeUIPluginsHost) 588 if (page_url.host() == chrome::kChromeUIPluginsHost)
588 return PluginsUI::GetFaviconResourceBytes(scale_factor); 589 return PluginsUI::GetFaviconResourceBytes(scale_factor);
589 #endif 590 #endif
590 591
591 return NULL; 592 return NULL;
592 } 593 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_commands.cc ('k') | content/browser/renderer_host/render_view_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698