chrome/chrome_browser.gypi - Issue 5213002: Fix for Bug 50726 "Save extension list and "winning" prefs from extensions"

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/chrome_browser.gypi

Issue 5213002: Fix for Bug 50726 "Save extension list and "winning" prefs from extensions" (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Further modifications for rebasing Created 10 years 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

« chrome/browser/extensions/extension_prefs.cc ('K') | « chrome/browser/ui/cocoa/extensions/extension_popup_controller_unittest.mm ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/chrome_browser.gypi

diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi

index 0b4f9915fa915b5eb6455cd490ec725beaab9fb0..942ce3707ce304466e665e0d40571ffd960ecf7d 100644

--- a/chrome/chrome_browser.gypi

+++ b/chrome/chrome_browser.gypi

@@ -1104,8 +1104,6 @@

'browser/extensions/extension_popup_api.h',

'browser/extensions/extension_prefs.cc',

'browser/extensions/extension_prefs.h',

- 'browser/extensions/extension_pref_store.cc',

- 'browser/extensions/extension_pref_store.h',

'browser/extensions/extension_process_manager.cc',

'browser/extensions/extension_process_manager.h',

'browser/extensions/extension_processes_api.cc',

@@ -1981,8 +1979,8 @@

'browser/prefs/browser_prefs.h',

'browser/prefs/command_line_pref_store.cc',

'browser/prefs/command_line_pref_store.h',

- 'browser/prefs/default_pref_store.cc',

- 'browser/prefs/default_pref_store.h',

+ 'browser/prefs/in_memory_pref_store.cc',

+ 'browser/prefs/in_memory_pref_store.h',

'browser/prefs/pref_member.cc',

'browser/prefs/pref_member.h',

'browser/prefs/pref_notifier.cc',