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

Unified Diff: chrome/browser/chromeos/login/ui/login_web_dialog_browsertest.cc

Issue 2542493002: Replace kCanMaximize/Minimize/Resize with kResizeBehavior. (Closed)
Patch Set: Fix int->bool compile issue. Created 4 years 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/browser/chromeos/login/ui/login_web_dialog_browsertest.cc
diff --git a/chrome/browser/chromeos/login/ui/login_web_dialog_browsertest.cc b/chrome/browser/chromeos/login/ui/login_web_dialog_browsertest.cc
index 573feb079a8c820e42de48ecc52f51ed668e0ed5..afaec93783d11789e6bb6d1e00c91276157528d8 100644
--- a/chrome/browser/chromeos/login/ui/login_web_dialog_browsertest.cc
+++ b/chrome/browser/chromeos/login/ui/login_web_dialog_browsertest.cc
@@ -8,6 +8,7 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/test/base/in_process_browser_test.h"
+#include "services/ui/public/interfaces/window_manager_constants.mojom.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/window.h"
#include "ui/wm/public/activation_client.h"
@@ -19,15 +20,16 @@ typedef InProcessBrowserTest LoginWebDialogTest;
// Test that LoginWebDialog is not minimizable.
IN_PROC_BROWSER_TEST_F(LoginWebDialogTest, CannotMinimize) {
LoginWebDialog* dialog = new LoginWebDialog(
- browser()->profile(), NULL, NULL, base::string16(), GURL());
+ browser()->profile(), nullptr, nullptr, base::string16(), GURL());
dialog->Show();
aura::client::ActivationClient* activation_client =
aura::client::GetActivationClient(
ash::Shell::GetInstance()->GetPrimaryRootWindow());
- aura::Window* active_window = activation_client->GetActiveWindow();
- ASSERT_TRUE(active_window != NULL);
- EXPECT_FALSE(active_window->GetProperty(aura::client::kCanMinimizeKey));
+ aura::Window* window = activation_client->GetActiveWindow();
+ ASSERT_TRUE(window);
+ EXPECT_EQ(0, window->GetProperty(aura::client::kResizeBehaviorKey) &
+ ui::mojom::kResizeBehaviorCanMinimize);
}
} // namespace chromeos
« no previous file with comments | « ash/wm/workspace/workspace_window_resizer_unittest.cc ('k') | chrome/browser/ui/ash/accelerator_commands_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698