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

Side by Side Diff: chrome/browser/ui/permission_bubble/permission_bubble_browser_test_util.cc

Issue 2868783002: Move requests from Show() argument to PermissionPrompt::Delegate (Closed)
Patch Set: tweak comment Created 3 years, 7 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/ui/permission_bubble/permission_bubble_browser_test_uti l.h" 5 #include "chrome/browser/ui/permission_bubble/permission_bubble_browser_test_uti l.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/memory/ptr_util.h" 8 #include "base/memory/ptr_util.h"
9 #include "chrome/browser/extensions/extension_browsertest.h" 9 #include "chrome/browser/extensions/extension_browsertest.h"
10 #include "chrome/browser/permissions/mock_permission_request.h" 10 #include "chrome/browser/permissions/mock_permission_request.h"
11 #include "chrome/browser/ui/browser.h" 11 #include "chrome/browser/ui/browser.h"
12 #include "chrome/browser/ui/browser_finder.h" 12 #include "chrome/browser/ui/browser_finder.h"
13 #include "chrome/browser/ui/browser_window.h" 13 #include "chrome/browser/ui/browser_window.h"
14 #include "chrome/browser/ui/extensions/app_launch_params.h" 14 #include "chrome/browser/ui/extensions/app_launch_params.h"
15 #include "chrome/browser/ui/extensions/application_launch.h" 15 #include "chrome/browser/ui/extensions/application_launch.h"
16 #include "chrome/browser/ui/tabs/tab_strip_model.h" 16 #include "chrome/browser/ui/tabs/tab_strip_model.h"
17 #include "chrome/common/chrome_switches.h" 17 #include "chrome/common/chrome_switches.h"
18 #include "chrome/grit/generated_resources.h" 18 #include "chrome/grit/generated_resources.h"
19 #include "ui/base/l10n/l10n_util.h" 19 #include "ui/base/l10n/l10n_util.h"
20 20
21 TestPermissionBubbleViewDelegate::TestPermissionBubbleViewDelegate() 21 TestPermissionBubbleViewDelegate::TestPermissionBubbleViewDelegate()
22 : PermissionPrompt::Delegate() { 22 : PermissionPrompt::Delegate() {
23 } 23 }
24 24
25 TestPermissionBubbleViewDelegate::~TestPermissionBubbleViewDelegate() {}
26
27 const std::vector<PermissionRequest*>&
28 TestPermissionBubbleViewDelegate::Requests() {
29 return requests_;
30 }
31
32 const std::vector<bool>& TestPermissionBubbleViewDelegate::AcceptStates() {
33 return accept_states_;
34 }
35
25 PermissionBubbleBrowserTest::PermissionBubbleBrowserTest() { 36 PermissionBubbleBrowserTest::PermissionBubbleBrowserTest() {
26 } 37 }
27 38
28 PermissionBubbleBrowserTest::~PermissionBubbleBrowserTest() { 39 PermissionBubbleBrowserTest::~PermissionBubbleBrowserTest() {
29 } 40 }
30 41
31 void PermissionBubbleBrowserTest::SetUpOnMainThread() { 42 void PermissionBubbleBrowserTest::SetUpOnMainThread() {
32 ExtensionBrowserTest::SetUpOnMainThread(); 43 ExtensionBrowserTest::SetUpOnMainThread();
33 44
34 // Add a single permission request. 45 // Add a single permission request.
35 requests_.push_back(base::MakeUnique<MockPermissionRequest>( 46 requests_.push_back(base::MakeUnique<MockPermissionRequest>(
36 "Request 1", l10n_util::GetStringUTF8(IDS_PERMISSION_ALLOW), 47 "Request 1", l10n_util::GetStringUTF8(IDS_PERMISSION_ALLOW),
37 l10n_util::GetStringUTF8(IDS_PERMISSION_DENY))); 48 l10n_util::GetStringUTF8(IDS_PERMISSION_DENY)));
49
50 std::vector<PermissionRequest*> raw_requests;
51 raw_requests.push_back(requests_[0].get());
52 test_delegate_.set_requests(raw_requests);
38 } 53 }
39 54
40 Browser* PermissionBubbleBrowserTest::OpenExtensionAppWindow() { 55 Browser* PermissionBubbleBrowserTest::OpenExtensionAppWindow() {
41 auto* extension = 56 auto* extension =
42 LoadExtension(test_data_dir_.AppendASCII("app_with_panel_container/")); 57 LoadExtension(test_data_dir_.AppendASCII("app_with_panel_container/"));
43 CHECK(extension); 58 CHECK(extension);
44 59
45 AppLaunchParams params( 60 AppLaunchParams params(
46 browser()->profile(), extension, extensions::LAUNCH_CONTAINER_PANEL, 61 browser()->profile(), extension, extensions::LAUNCH_CONTAINER_PANEL,
47 WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_TEST); 62 WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_TEST);
48 63
49 content::WebContents* app_window = OpenApplication(params); 64 content::WebContents* app_window = OpenApplication(params);
50 CHECK(app_window); 65 CHECK(app_window);
51 66
52 Browser* app_browser = chrome::FindBrowserWithWebContents(app_window); 67 Browser* app_browser = chrome::FindBrowserWithWebContents(app_window);
53 CHECK(app_browser); 68 CHECK(app_browser);
54 CHECK(app_browser->is_app()); 69 CHECK(app_browser->is_app());
55 70
56 return app_browser; 71 return app_browser;
57 } 72 }
58 73
59 std::vector<PermissionRequest*> PermissionBubbleBrowserTest::requests() {
60 std::vector<PermissionRequest*> result;
61 for (const auto& request : requests_)
62 result.push_back(request.get());
63 return result;
64 }
65
66 PermissionBubbleKioskBrowserTest::PermissionBubbleKioskBrowserTest() { 74 PermissionBubbleKioskBrowserTest::PermissionBubbleKioskBrowserTest() {
67 } 75 }
68 76
69 PermissionBubbleKioskBrowserTest::~PermissionBubbleKioskBrowserTest() { 77 PermissionBubbleKioskBrowserTest::~PermissionBubbleKioskBrowserTest() {
70 } 78 }
71 79
72 void PermissionBubbleKioskBrowserTest::SetUpCommandLine( 80 void PermissionBubbleKioskBrowserTest::SetUpCommandLine(
73 base::CommandLine* command_line) { 81 base::CommandLine* command_line) {
74 PermissionBubbleBrowserTest::SetUpCommandLine(command_line); 82 PermissionBubbleBrowserTest::SetUpCommandLine(command_line);
75 command_line->AppendSwitch(switches::kKioskMode); 83 command_line->AppendSwitch(switches::kKioskMode);
76 } 84 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698