chrome/browser/extensions/extension_install_ui.cc - Issue 3173018: Merge 55103 - Refactored extension privilege enumeration and implemented URLP...

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: chrome/browser/extensions/extension_install_ui.cc

Issue 3173018: Merge 55103 - Refactored extension privilege enumeration and implemented URLP... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/472/src/

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

None

« no previous file with comments | « chrome/browser/extensions/extension_browsertests_misc.cc ('k') | chrome/browser/extensions/extension_protocols.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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/extensions/extension_install_ui.h"	5 #include "chrome/browser/extensions/extension_install_ui.h"

6	6

7 #include <map>	7 #include <map>

8	8

9 #include "app/l10n_util.h"	9 #include "app/l10n_util.h"

10 #include "app/resource_bundle.h"	10 #include "app/resource_bundle.h"

11 #include "base/command_line.h"	11 #include "base/command_line.h"

12 #include "base/file_util.h"	12 #include "base/file_util.h"

13 #include "base/rand_util.h"	13 #include "base/rand_util.h"

14 #include "base/string_util.h"	14 #include "base/string_util.h"

15 #include "base/utf_string_conversions.h"	15 #include "base/utf_string_conversions.h"

16 #include "chrome/browser/browser_list.h"	16 #include "chrome/browser/browser_list.h"

17 #include "chrome/browser/browser_window.h"	17 #include "chrome/browser/browser_window.h"

18 #include "chrome/browser/extensions/theme_installed_infobar_delegate.h"	18 #include "chrome/browser/extensions/theme_installed_infobar_delegate.h"

19 #include "chrome/browser/platform_util.h"	19 #include "chrome/browser/platform_util.h"

20 #include "chrome/browser/profile.h"	20 #include "chrome/browser/profile.h"

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

22 #if defined(TOOLKIT_VIEWS)	22 #if defined(TOOLKIT_VIEWS)

23 #include "chrome/browser/views/app_launcher.h"	23 #include "chrome/browser/views/app_launcher.h"

24 #include "chrome/browser/views/extensions/extension_installed_bubble.h"	24 #include "chrome/browser/views/extensions/extension_installed_bubble.h"

25 #elif defined(TOOLKIT_GTK)	25 #elif defined(TOOLKIT_GTK)

26 #include "chrome/browser/gtk/extension_installed_bubble_gtk.h"	26 #include "chrome/browser/gtk/extension_installed_bubble_gtk.h"

27 #endif	27 #endif

28 #include "chrome/common/chrome_switches.h"	28 #include "chrome/common/chrome_switches.h"

error: old chunk mismatch
OLD	NEW

Side by Side Diff: chrome/browser/extensions/extension_install_ui.cc

error: old chunk mismatch