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

Side by Side Diff: chrome/browser/apps/web_view_interactive_browsertest.cc

Issue 625113002: replace OVERRIDE and FINAL with override and final in chrome/browser/[a-i]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix newly added OVERRIDEs Created 6 years, 2 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/strings/stringprintf.h" 5 #include "base/strings/stringprintf.h"
6 #include "base/strings/utf_string_conversions.h" 6 #include "base/strings/utf_string_conversions.h"
7 #include "chrome/app/chrome_command_ids.h" 7 #include "chrome/app/chrome_command_ids.h"
8 #include "chrome/browser/apps/app_browsertest_util.h" 8 #include "chrome/browser/apps/app_browsertest_util.h"
9 #include "chrome/browser/chrome_content_browser_client.h" 9 #include "chrome/browser/chrome_content_browser_client.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 60
61 remove_message_loop_runner_ = new content::MessageLoopRunner; 61 remove_message_loop_runner_ = new content::MessageLoopRunner;
62 remove_message_loop_runner_->Run(); 62 remove_message_loop_runner_->Run();
63 } 63 }
64 64
65 size_t guest_add_count() { return guest_add_count_; } 65 size_t guest_add_count() { return guest_add_count_; }
66 66
67 private: 67 private:
68 // GuestViewManager override: 68 // GuestViewManager override:
69 virtual void AddGuest(int guest_instance_id, 69 virtual void AddGuest(int guest_instance_id,
70 content::WebContents* guest_web_contents) OVERRIDE{ 70 content::WebContents* guest_web_contents) override{
71 GuestViewManager::AddGuest(guest_instance_id, guest_web_contents); 71 GuestViewManager::AddGuest(guest_instance_id, guest_web_contents);
72 web_contents_ = guest_web_contents; 72 web_contents_ = guest_web_contents;
73 ++guest_add_count_; 73 ++guest_add_count_;
74 74
75 if (add_message_loop_runner_.get()) 75 if (add_message_loop_runner_.get())
76 add_message_loop_runner_->Quit(); 76 add_message_loop_runner_->Quit();
77 } 77 }
78 78
79 virtual void RemoveGuest(int guest_instance_id) OVERRIDE { 79 virtual void RemoveGuest(int guest_instance_id) override {
80 GuestViewManager::RemoveGuest(guest_instance_id); 80 GuestViewManager::RemoveGuest(guest_instance_id);
81 ++guest_remove_count_; 81 ++guest_remove_count_;
82 82
83 if (remove_message_loop_runner_.get()) 83 if (remove_message_loop_runner_.get())
84 remove_message_loop_runner_->Quit(); 84 remove_message_loop_runner_->Quit();
85 } 85 }
86 86
87 size_t guest_add_count_; 87 size_t guest_add_count_;
88 size_t guest_remove_count_; 88 size_t guest_remove_count_;
89 content::WebContents* web_contents_; 89 content::WebContents* web_contents_;
90 scoped_refptr<content::MessageLoopRunner> add_message_loop_runner_; 90 scoped_refptr<content::MessageLoopRunner> add_message_loop_runner_;
91 scoped_refptr<content::MessageLoopRunner> remove_message_loop_runner_; 91 scoped_refptr<content::MessageLoopRunner> remove_message_loop_runner_;
92 }; 92 };
93 93
94 // Test factory for creating test instances of GuestViewManager. 94 // Test factory for creating test instances of GuestViewManager.
95 class TestGuestViewManagerFactory : public extensions::GuestViewManagerFactory { 95 class TestGuestViewManagerFactory : public extensions::GuestViewManagerFactory {
96 public: 96 public:
97 TestGuestViewManagerFactory() : 97 TestGuestViewManagerFactory() :
98 test_guest_view_manager_(NULL) {} 98 test_guest_view_manager_(NULL) {}
99 99
100 virtual ~TestGuestViewManagerFactory() {} 100 virtual ~TestGuestViewManagerFactory() {}
101 101
102 virtual extensions::GuestViewManager* CreateGuestViewManager( 102 virtual extensions::GuestViewManager* CreateGuestViewManager(
103 content::BrowserContext* context) OVERRIDE { 103 content::BrowserContext* context) override {
104 return GetManager(context); 104 return GetManager(context);
105 } 105 }
106 106
107 TestGuestViewManager* GetManager(content::BrowserContext* context) { 107 TestGuestViewManager* GetManager(content::BrowserContext* context) {
108 if (!test_guest_view_manager_) { 108 if (!test_guest_view_manager_) {
109 test_guest_view_manager_ = new TestGuestViewManager(context); 109 test_guest_view_manager_ = new TestGuestViewManager(context);
110 } 110 }
111 return test_guest_view_manager_; 111 return test_guest_view_manager_;
112 } 112 }
113 113
(...skipping 1047 matching lines...) Expand 10 before | Expand all | Expand 10 after
1161 1161
1162 // Now verify that the selection text propagates properly to RWHV. 1162 // Now verify that the selection text propagates properly to RWHV.
1163 content::RenderWidgetHostView* guest_rwhv = 1163 content::RenderWidgetHostView* guest_rwhv =
1164 guest_web_contents()->GetRenderWidgetHostView(); 1164 guest_web_contents()->GetRenderWidgetHostView();
1165 ASSERT_TRUE(guest_rwhv); 1165 ASSERT_TRUE(guest_rwhv);
1166 std::string selected_text = base::UTF16ToUTF8(guest_rwhv->GetSelectedText()); 1166 std::string selected_text = base::UTF16ToUTF8(guest_rwhv->GetSelectedText());
1167 ASSERT_TRUE(selected_text.size() >= 10u); 1167 ASSERT_TRUE(selected_text.size() >= 10u);
1168 ASSERT_EQ("AAAAAAAAAA", selected_text.substr(0, 10)); 1168 ASSERT_EQ("AAAAAAAAAA", selected_text.substr(0, 10));
1169 } 1169 }
1170 #endif 1170 #endif
OLDNEW
« no previous file with comments | « chrome/browser/apps/web_view_browsertest.cc ('k') | chrome/browser/apps/window_controls_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698