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

Side by Side Diff: chrome/test/ppapi/ppapi_test.cc

Issue 240193003: Move Infobars core files to the Infobars component (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix nib name on mac Created 6 years, 8 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
« no previous file with comments | « chrome/test/gpu/webgl_infobar_browsertest.cc ('k') | components/OWNERS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/test/ppapi/ppapi_test.h" 5 #include "chrome/test/ppapi/ppapi_test.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
11 #include "base/strings/stringprintf.h" 11 #include "base/strings/stringprintf.h"
12 #include "chrome/browser/chrome_notification_types.h" 12 #include "chrome/browser/chrome_notification_types.h"
13 #include "chrome/browser/content_settings/host_content_settings_map.h" 13 #include "chrome/browser/content_settings/host_content_settings_map.h"
14 #include "chrome/browser/infobars/confirm_infobar_delegate.h" 14 #include "chrome/browser/infobars/confirm_infobar_delegate.h"
15 #include "chrome/browser/infobars/infobar.h"
16 #include "chrome/browser/infobars/infobar_service.h" 15 #include "chrome/browser/infobars/infobar_service.h"
17 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
18 #include "chrome/browser/ui/browser.h" 17 #include "chrome/browser/ui/browser.h"
19 #include "chrome/browser/ui/tabs/tab_strip_model.h" 18 #include "chrome/browser/ui/tabs/tab_strip_model.h"
20 #include "chrome/common/chrome_paths.h" 19 #include "chrome/common/chrome_paths.h"
21 #include "chrome/common/chrome_switches.h" 20 #include "chrome/common/chrome_switches.h"
22 #include "chrome/test/base/test_switches.h" 21 #include "chrome/test/base/test_switches.h"
23 #include "chrome/test/base/ui_test_utils.h" 22 #include "chrome/test/base/ui_test_utils.h"
23 #include "components/infobars/core/infobar.h"
24 #include "components/nacl/common/nacl_switches.h" 24 #include "components/nacl/common/nacl_switches.h"
25 #include "content/public/browser/dom_operation_notification_details.h" 25 #include "content/public/browser/dom_operation_notification_details.h"
26 #include "content/public/browser/notification_service.h" 26 #include "content/public/browser/notification_service.h"
27 #include "content/public/browser/web_contents.h" 27 #include "content/public/browser/web_contents.h"
28 #include "net/base/filename_util.h" 28 #include "net/base/filename_util.h"
29 #include "net/base/test_data_directory.h" 29 #include "net/base/test_data_directory.h"
30 #include "ppapi/shared_impl/ppapi_switches.h" 30 #include "ppapi/shared_impl/ppapi_switches.h"
31 #include "ui/gl/gl_switches.h" 31 #include "ui/gl/gl_switches.h"
32 32
33 using content::DomOperationNotificationDetails; 33 using content::DomOperationNotificationDetails;
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 ASSERT_TRUE(web_contents != NULL); 109 ASSERT_TRUE(web_contents != NULL);
110 InfoBarService* infobar_service = 110 InfoBarService* infobar_service =
111 InfoBarService::FromWebContents(web_contents); 111 InfoBarService::FromWebContents(web_contents);
112 ASSERT_TRUE(infobar_service != NULL); 112 ASSERT_TRUE(infobar_service != NULL);
113 113
114 EXPECT_EQ(expecting_infobar_ ? 1U : 0U, infobar_service->infobar_count()); 114 EXPECT_EQ(expecting_infobar_ ? 1U : 0U, infobar_service->infobar_count());
115 if (!expecting_infobar_) 115 if (!expecting_infobar_)
116 return; 116 return;
117 expecting_infobar_ = false; 117 expecting_infobar_ = false;
118 118
119 InfoBar* infobar = infobar_service->infobar_at(0); 119 infobars::InfoBar* infobar = infobar_service->infobar_at(0);
120 ConfirmInfoBarDelegate* delegate = 120 ConfirmInfoBarDelegate* delegate =
121 infobar->delegate()->AsConfirmInfoBarDelegate(); 121 infobar->delegate()->AsConfirmInfoBarDelegate();
122 ASSERT_TRUE(delegate != NULL); 122 ASSERT_TRUE(delegate != NULL);
123 if (should_accept_) 123 if (should_accept_)
124 delegate->Accept(); 124 delegate->Accept();
125 else 125 else
126 delegate->Cancel(); 126 delegate->Cancel();
127 127
128 infobar_service->RemoveInfoBar(infobar); 128 infobar_service->RemoveInfoBar(infobar);
129 } 129 }
(...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after
487 } 487 }
488 488
489 void PPAPIBrokerInfoBarTest::SetUpOnMainThread() { 489 void PPAPIBrokerInfoBarTest::SetUpOnMainThread() {
490 // The default content setting for the PPAPI broker is ASK. We purposefully 490 // The default content setting for the PPAPI broker is ASK. We purposefully
491 // don't call PPAPITestBase::SetUpOnMainThread() to keep it that way. 491 // don't call PPAPITestBase::SetUpOnMainThread() to keep it that way.
492 492
493 base::FilePath plugin_lib; 493 base::FilePath plugin_lib;
494 EXPECT_TRUE(PathService::Get(chrome::FILE_NACL_PLUGIN, &plugin_lib)); 494 EXPECT_TRUE(PathService::Get(chrome::FILE_NACL_PLUGIN, &plugin_lib));
495 EXPECT_TRUE(base::PathExists(plugin_lib)); 495 EXPECT_TRUE(base::PathExists(plugin_lib));
496 } 496 }
OLDNEW
« no previous file with comments | « chrome/test/gpu/webgl_infobar_browsertest.cc ('k') | components/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698