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

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

Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 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
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/extensions/extension_install_prompt.h" 5 #include "chrome/browser/extensions/extension_install_prompt.h"
6 6
7 #include <map> 7 #include <map>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
11 #include "base/prefs/pref_service.h" 11 #include "base/prefs/pref_service.h"
12 #include "base/strings/string_number_conversions.h" 12 #include "base/strings/string_number_conversions.h"
13 #include "base/strings/string_util.h" 13 #include "base/strings/string_util.h"
14 #include "base/strings/stringprintf.h" 14 #include "base/strings/stringprintf.h"
15 #include "base/strings/utf_string_conversions.h" 15 #include "base/strings/utf_string_conversions.h"
16 #include "chrome/browser/extensions/bundle_installer.h" 16 #include "chrome/browser/extensions/bundle_installer.h"
17 #include "chrome/browser/extensions/extension_install_ui.h" 17 #include "chrome/browser/extensions/extension_install_ui.h"
18 #include "chrome/browser/extensions/extension_util.h" 18 #include "chrome/browser/extensions/extension_util.h"
19 #include "chrome/browser/profiles/profile.h" 19 #include "chrome/browser/profiles/profile.h"
20 #include "chrome/browser/ui/browser.h" 20 #include "chrome/browser/ui/browser.h"
21 #include "chrome/browser/ui/browser_window.h" 21 #include "chrome/browser/ui/browser_window.h"
22 #include "chrome/common/chrome_switches.h" 22 #include "chrome/common/chrome_switches.h"
23 #include "chrome/common/pref_names.h" 23 #include "chrome/common/pref_names.h"
24 #include "chrome/grit/chromium_strings.h"
25 #include "chrome/grit/generated_resources.h"
24 #include "content/public/browser/web_contents.h" 26 #include "content/public/browser/web_contents.h"
25 #include "extensions/browser/extension_prefs.h" 27 #include "extensions/browser/extension_prefs.h"
26 #include "extensions/browser/extension_util.h" 28 #include "extensions/browser/extension_util.h"
27 #include "extensions/browser/image_loader.h" 29 #include "extensions/browser/image_loader.h"
28 #include "extensions/common/constants.h" 30 #include "extensions/common/constants.h"
29 #include "extensions/common/extension.h" 31 #include "extensions/common/extension.h"
30 #include "extensions/common/extension_icon_set.h" 32 #include "extensions/common/extension_icon_set.h"
31 #include "extensions/common/extension_resource.h" 33 #include "extensions/common/extension_resource.h"
32 #include "extensions/common/feature_switch.h" 34 #include "extensions/common/feature_switch.h"
33 #include "extensions/common/manifest.h" 35 #include "extensions/common/manifest.h"
34 #include "extensions/common/manifest_constants.h" 36 #include "extensions/common/manifest_constants.h"
35 #include "extensions/common/manifest_handlers/icons_handler.h" 37 #include "extensions/common/manifest_handlers/icons_handler.h"
36 #include "extensions/common/permissions/permission_message_provider.h" 38 #include "extensions/common/permissions/permission_message_provider.h"
37 #include "extensions/common/permissions/permission_set.h" 39 #include "extensions/common/permissions/permission_set.h"
38 #include "extensions/common/permissions/permissions_data.h" 40 #include "extensions/common/permissions/permissions_data.h"
39 #include "extensions/common/url_pattern.h" 41 #include "extensions/common/url_pattern.h"
40 #include "grit/chromium_strings.h"
41 #include "grit/generated_resources.h"
42 #include "grit/theme_resources.h" 42 #include "grit/theme_resources.h"
43 #include "ui/base/l10n/l10n_util.h" 43 #include "ui/base/l10n/l10n_util.h"
44 #include "ui/base/resource/resource_bundle.h" 44 #include "ui/base/resource/resource_bundle.h"
45 #include "ui/gfx/image/image.h" 45 #include "ui/gfx/image/image.h"
46 46
47 using extensions::BundleInstaller; 47 using extensions::BundleInstaller;
48 using extensions::Extension; 48 using extensions::Extension;
49 using extensions::Manifest; 49 using extensions::Manifest;
50 using extensions::PermissionSet; 50 using extensions::PermissionSet;
51 51
(...skipping 724 matching lines...) Expand 10 before | Expand all | Expand 10 after
776 } 776 }
777 777
778 if (AutoConfirmPrompt(delegate_)) 778 if (AutoConfirmPrompt(delegate_))
779 return; 779 return;
780 780
781 if (show_dialog_callback_.is_null()) 781 if (show_dialog_callback_.is_null())
782 GetDefaultShowDialogCallback().Run(show_params_, delegate_, prompt_); 782 GetDefaultShowDialogCallback().Run(show_params_, delegate_, prompt_);
783 else 783 else
784 show_dialog_callback_.Run(show_params_, delegate_, prompt_); 784 show_dialog_callback_.Run(show_params_, delegate_, prompt_);
785 } 785 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_error_ui.cc ('k') | chrome/browser/extensions/extension_install_prompt_experiment.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698