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

Unified Diff: chrome/test/base/test_browser_window.cc

Issue 1198313003: Fix the browser match rules. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: chrome/test/base/test_browser_window.cc
diff --git a/chrome/test/base/test_browser_window.cc b/chrome/test/base/test_browser_window.cc
index 8bfc54c0b946c7117030471a426adce64233eb70..6ae2af9e1c841d8f40cb33fa3b7ed0c449a406ac 100644
--- a/chrome/test/base/test_browser_window.cc
+++ b/chrome/test/base/test_browser_window.cc
@@ -6,9 +6,9 @@
#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/browser_list_observer.h"
+#include "ui/aura/window.h"
#include "ui/gfx/geometry/rect.h"
-
// Helpers --------------------------------------------------------------------
namespace chrome {
@@ -231,3 +231,57 @@ void TestBrowserWindow::ExecuteExtensionCommand(
ExclusiveAccessContext* TestBrowserWindow::GetExclusiveAccessContext() {
return nullptr;
}
+
+#if defined(USE_AURA)
+
+// TestBrowserWindowAura -------------------------------------------------------
+
+TestBrowserWindowAura::TestBrowserWindowAura(aura::Window* native_window)
+ : native_window_(native_window) {
+}
+
+TestBrowserWindowAura::~TestBrowserWindowAura() {
+}
+
+gfx::NativeWindow TestBrowserWindowAura::GetNativeWindow() const {
+ return native_window_.get();
+}
+
+void TestBrowserWindowAura::Show() {
+ native_window_->Show();
+}
+
+void TestBrowserWindowAura::Hide() {
+ native_window_->Hide();
+}
+
+gfx::Rect TestBrowserWindowAura::GetBounds() const {
+ return native_window_->bounds();
+}
+
+Browser* TestBrowserWindowAura::browser() {
+ return browser_.get();
+}
+
+void TestBrowserWindowAura::CreateBrowser(const Browser::CreateParams& params) {
+ Browser::CreateParams create_params = params;
+ create_params.window = this;
+ browser_.reset(new Browser(create_params));
+}
+
+scoped_ptr<TestBrowserWindowAura> CreateBrowserWithNativeWindowForParams(
+ const Browser::CreateParams& params) {
+ // Create a window.
msw 2015/07/07 18:11:55 nit: remove comment.
xdai1 2015/07/08 00:26:21 Done.
+ aura::Window* window = new aura::Window(nullptr);
+ window->set_id(0);
+ window->SetType(ui::wm::WINDOW_TYPE_NORMAL);
+ window->Init(ui::LAYER_TEXTURED);
+ window->Show();
+
+ scoped_ptr<TestBrowserWindowAura> browser_window(
+ new TestBrowserWindowAura(window));
+ browser_window->CreateBrowser(params);
+ return browser_window.Pass();
+}
+
+#endif
« chrome/test/base/test_browser_window.h ('K') | « chrome/test/base/test_browser_window.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698