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

Side by Side Diff: chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.mm

Issue 12303030: Merge 182576 to M26 beta branch. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1410/src/
Patch Set: Created 7 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
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 #import "chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils. h" 5 #import "chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils. h"
6 6
7 #include "base/file_path.h" 7 #include "base/file_path.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/json/json_file_value_serializer.h" 9 #include "base/json/json_file_value_serializer.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 } 66 }
67 67
68 ExtensionInstallPrompt::Prompt BuildExtensionInstallPrompt( 68 ExtensionInstallPrompt::Prompt BuildExtensionInstallPrompt(
69 Extension* extension) { 69 Extension* extension) {
70 ExtensionInstallPrompt::Prompt prompt(ExtensionInstallPrompt::INSTALL_PROMPT); 70 ExtensionInstallPrompt::Prompt prompt(ExtensionInstallPrompt::INSTALL_PROMPT);
71 prompt.set_extension(extension); 71 prompt.set_extension(extension);
72 prompt.set_icon(LoadInstallPromptIcon()); 72 prompt.set_icon(LoadInstallPromptIcon());
73 return prompt; 73 return prompt;
74 } 74 }
75 75
76 ExtensionInstallPrompt::Prompt BuildExtensionPostInstallPermissionsPrompt(
77 Extension* extension) {
78 ExtensionInstallPrompt::Prompt prompt(
79 ExtensionInstallPrompt::POST_INSTALL_PERMISSIONS_PROMPT);
80 prompt.set_extension(extension);
81 prompt.set_icon(LoadInstallPromptIcon());
82 return prompt;
83 }
84
76 } // namespace chrome 85 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698