chrome/browser/prefs/browser_prefs.cc - Issue 11747025: Run the JSON Schema Compiler's bundle compilation on JSON files. Previously it

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

Unified Diff: chrome/browser/prefs/browser_prefs.cc

Issue 11747025: Run the JSON Schema Compiler's bundle compilation on JSON files. Previously it (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: restore fileBrowserPrivate bindings Created 7 years, 11 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/performance_monitor/performance_monitor.gyp ('k') | chrome/browser/sync/glue/chrome_extensions_activity_monitor.cc » ('j') | tools/json_schema_compiler/model.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/prefs/browser_prefs.cc

diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc

index 3ac47e0f6ee34834a45c770de87a734bd01c8101..1cd0ee890447237020b2ddcd95f979f333fdd0f1 100644

--- a/chrome/browser/prefs/browser_prefs.cc

+++ b/chrome/browser/prefs/browser_prefs.cc

@@ -17,7 +17,7 @@

#include "chrome/browser/devtools/devtools_window.h"

#include "chrome/browser/download/download_prefs.h"

#include "chrome/browser/extensions/api/commands/command_service.h"

-#include "chrome/browser/extensions/api/tabs/tabs.h"

+#include "chrome/browser/extensions/api/tabs/tabs_api.h"

#include "chrome/browser/extensions/component_loader.h"

#include "chrome/browser/extensions/extension_prefs.h"

#include "chrome/browser/extensions/extension_web_ui.h"

@@ -279,7 +279,7 @@ void RegisterUserPrefs(PrefServiceSyncable* user_prefs) {

#endif

#if !defined(OS_ANDROID)

- CaptureVisibleTabFunction::RegisterUserPrefs(user_prefs);

+ TabsCaptureVisibleTabFunction::RegisterUserPrefs(user_prefs);

ChromeToMobileService::RegisterUserPrefs(user_prefs);

DevToolsWindow::RegisterUserPrefs(user_prefs);

extensions::CommandService::RegisterUserPrefs(user_prefs);