content/browser/webui/web_ui_factory.cc - Issue 6575054: WebUI: Move the core files of WebUI from chrome/browser/webui to content/webui.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: content/browser/webui/web_ui_factory.cc

Issue 6575054: WebUI: Move the core files of WebUI from chrome/browser/webui to content/webui. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix Created 9 years, 10 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

« no previous file with comments | « content/browser/webui/web_ui_factory.h ('k') | content/browser/webui/web_ui_handler_browsertest.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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/webui/web_ui_factory.h"	5 #include "content/browser/webui/web_ui_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/extensions/extensions_ui.h"	11 #include "chrome/browser/extensions/extensions_ui.h"

12 #include "chrome/browser/printing/print_dialog_cloud.h"	12 #include "chrome/browser/printing/print_dialog_cloud.h"

13 #include "chrome/browser/profiles/profile.h"	13 #include "chrome/browser/profiles/profile.h"

14 #include "chrome/browser/tab_contents/tab_contents.h"	14 #include "chrome/browser/tab_contents/tab_contents.h"

15 #include "chrome/browser/webui/bookmarks_ui.h"	15 #include "chrome/browser/webui/bookmarks_ui.h"

(...skipping 326 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
342 if (page_url.host() == chrome::kChromeUIPluginsHost)	342 if (page_url.host() == chrome::kChromeUIPluginsHost)

343 return PluginsUI::GetFaviconResourceBytes();	343 return PluginsUI::GetFaviconResourceBytes();

344	344

345 #if defined(ENABLE_REMOTING)	345 #if defined(ENABLE_REMOTING)

346 if (page_url.host() == chrome::kChromeUIRemotingHost)	346 if (page_url.host() == chrome::kChromeUIRemotingHost)

347 return RemotingUI::GetFaviconResourceBytes();	347 return RemotingUI::GetFaviconResourceBytes();

348 #endif	348 #endif

349	349

350 return NULL;	350 return NULL;

351 }	351 }

OLD	NEW