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

Side by Side Diff: chrome/browser/ui/website_settings/permission_bubble_manager_unittest.cc

Issue 1292353006: Mac Changes for BubbleManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mcdb-mac-3.gitbr
Patch Set: Created 5 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/message_loop/message_loop.h" 6 #include "base/message_loop/message_loop.h"
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/browser/ui/website_settings/mock_permission_bubble_request.h" 8 #include "chrome/browser/ui/website_settings/mock_permission_bubble_request.h"
9 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h" 9 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h"
10 #include "chrome/browser/ui/website_settings/permission_bubble_request.h" 10 #include "chrome/browser/ui/website_settings/permission_bubble_request.h"
11 #include "chrome/browser/ui/website_settings/permission_bubble_view.h" 11 #include "chrome/browser/ui/website_settings/permission_bubble_view.h"
12 #include "chrome/common/chrome_switches.h" 12 #include "chrome/common/chrome_switches.h"
13 #include "chrome/test/base/chrome_render_view_host_test_harness.h" 13 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
14 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
15 15
16 // TODO(hcarmona): compile this
17
16 namespace { 18 namespace {
17 19
18 class MockView : public PermissionBubbleView { 20 class MockView : public PermissionBubbleView {
19 public: 21 public:
20 MockView() : shown_(false), can_accept_updates_(true), delegate_(NULL) {} 22 MockView() : shown_(false), can_accept_updates_(true), delegate_(NULL) {}
21 ~MockView() override {} 23 ~MockView() override {}
22 24
23 static scoped_ptr<PermissionBubbleView> Create(Browser* browser) { 25 static scoped_ptr<PermissionBubbleView> Create(Browser* browser) {
24 return make_scoped_ptr(new MockView()); 26 return make_scoped_ptr(new MockView());
25 } 27 }
(...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after
562 ShowBubble(); 564 ShowBubble();
563 WaitForFrameLoad(); 565 WaitForFrameLoad();
564 WaitForCoalescing(); 566 WaitForCoalescing();
565 manager_->AddRequest(&request1_); 567 manager_->AddRequest(&request1_);
566 manager_->AddRequest(&iframe_request_other_domain_); 568 manager_->AddRequest(&iframe_request_other_domain_);
567 manager_->AddRequest(&request2_); 569 manager_->AddRequest(&request2_);
568 base::MessageLoop::current()->RunUntilIdle(); 570 base::MessageLoop::current()->RunUntilIdle();
569 571
570 EXPECT_TRUE(view_()->shown_); 572 EXPECT_TRUE(view_()->shown_);
571 } 573 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698