| OLD | NEW |
| 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 "components/web_view/public/cpp/web_view.h" | 5 #include "components/web_view/public/cpp/web_view.h" |
| 6 | 6 |
| 7 #include "base/base_paths.h" | 7 #include "base/base_paths.h" |
| 8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
| 9 #include "base/files/file_util.h" | 9 #include "base/files/file_util.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 91 run_loop_->Quit(); | 91 run_loop_->Quit(); |
| 92 } | 92 } |
| 93 } | 93 } |
| 94 | 94 |
| 95 // Overridden from ApplicationDelegate: | 95 // Overridden from ApplicationDelegate: |
| 96 void Initialize(mojo::ApplicationImpl* app) override { | 96 void Initialize(mojo::ApplicationImpl* app) override { |
| 97 WindowServerTestBase::Initialize(app); | 97 WindowServerTestBase::Initialize(app); |
| 98 app_ = app; | 98 app_ = app; |
| 99 } | 99 } |
| 100 | 100 |
| 101 // Overridden from ViewTreeDelegate: | 101 // Overridden from WindowTreeDelegate: |
| 102 void OnEmbed(mus::Window* root) override { | 102 void OnEmbed(mus::Window* root) override { |
| 103 content_ = root->connection()->NewWindow(); | 103 content_ = root->connection()->NewWindow(); |
| 104 content_->SetBounds(root->bounds()); | 104 content_->SetBounds(root->bounds()); |
| 105 root->AddChild(content_); | 105 root->AddChild(content_); |
| 106 content_->SetVisible(true); | 106 content_->SetVisible(true); |
| 107 | 107 |
| 108 web_view_.Init(app_, content_); | 108 web_view_.Init(app_, content_); |
| 109 | 109 |
| 110 WindowServerTestBase::OnEmbed(root); | 110 WindowServerTestBase::OnEmbed(root); |
| 111 } | 111 } |
| (...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 312 EXPECT_EQ(i, active_find_match()); | 312 EXPECT_EQ(i, active_find_match()); |
| 313 } | 313 } |
| 314 | 314 |
| 315 // We should wrap around. | 315 // We should wrap around. |
| 316 web_view()->Find("Green", true); | 316 web_view()->Find("Green", true); |
| 317 StartNestedRunLoopUntil(ACTIVE_FIND_UPDATE); | 317 StartNestedRunLoopUntil(ACTIVE_FIND_UPDATE); |
| 318 EXPECT_EQ(1, active_find_match()); | 318 EXPECT_EQ(1, active_find_match()); |
| 319 } | 319 } |
| 320 | 320 |
| 321 } // namespace web_view | 321 } // namespace web_view |
| OLD | NEW |