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

Side by Side Diff: chrome/browser/chromeos/login/network_screen_browsertest.cc

Issue 10827271: Replace views::Event with ui::Event. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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 <string> 5 #include <string>
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/string16.h" 9 #include "base/string16.h"
10 #include "base/string_number_conversions.h" 10 #include "base/string_number_conversions.h"
(...skipping 21 matching lines...) Expand all
32 using ::testing::AnyNumber; 32 using ::testing::AnyNumber;
33 using ::testing::InvokeWithoutArgs; 33 using ::testing::InvokeWithoutArgs;
34 using ::testing::Return; 34 using ::testing::Return;
35 using ::testing::ReturnRef; 35 using ::testing::ReturnRef;
36 using ::testing::_; 36 using ::testing::_;
37 using views::Button; 37 using views::Button;
38 38
39 class DummyButtonListener : public views::ButtonListener { 39 class DummyButtonListener : public views::ButtonListener {
40 public: 40 public:
41 virtual void ButtonPressed(views::Button* sender, 41 virtual void ButtonPressed(views::Button* sender,
42 const views::Event& event) {} 42 const ui::Event& event) {}
43 }; 43 };
44 44
45 class NetworkScreenTest : public WizardInProcessBrowserTest { 45 class NetworkScreenTest : public WizardInProcessBrowserTest {
46 public: 46 public:
47 NetworkScreenTest(): WizardInProcessBrowserTest("network"), 47 NetworkScreenTest(): WizardInProcessBrowserTest("network"),
48 mock_network_library_(NULL) { 48 mock_network_library_(NULL) {
49 } 49 }
50 50
51 protected: 51 protected:
52 virtual void SetUpInProcessBrowserTestFixture() { 52 virtual void SetUpInProcessBrowserTestFixture() {
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 // EXPECT_FALSE(actor_->IsConnecting()); 286 // EXPECT_FALSE(actor_->IsConnecting());
287 network_screen_->OnConnectionTimeout(); 287 network_screen_->OnConnectionTimeout();
288 288
289 // Close infobubble with error message - it makes the test stable. 289 // Close infobubble with error message - it makes the test stable.
290 // EXPECT_FALSE(actor_->IsContinueEnabled()); 290 // EXPECT_FALSE(actor_->IsContinueEnabled());
291 // EXPECT_FALSE(actor_->IsConnecting()); 291 // EXPECT_FALSE(actor_->IsConnecting());
292 // actor_->ClearErrors(); 292 // actor_->ClearErrors();
293 } 293 }
294 294
295 } // namespace chromeos 295 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/message_bubble.cc ('k') | chrome/browser/chromeos/login/password_changed_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698