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

Unified Diff: chrome/browser/ui/ash/accelerator_commands_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
« no previous file with comments | « chrome/browser/chromeos/login/ui/login_web_dialog_browsertest.cc ('k') | ui/aura/client/aura_constants.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/accelerator_commands_browsertest.cc
diff --git a/chrome/browser/ui/ash/accelerator_commands_browsertest.cc b/chrome/browser/ui/ash/accelerator_commands_browsertest.cc
index a7064c4d179a23acea81635b7aa24251c94667f1..3484b646f8f0dcbb30643113f86f48dda4ca9b09 100644
--- a/chrome/browser/ui/ash/accelerator_commands_browsertest.cc
+++ b/chrome/browser/ui/ash/accelerator_commands_browsertest.cc
@@ -21,6 +21,7 @@
#include "chrome/test/base/in_process_browser_test.h"
#include "extensions/browser/app_window/app_window.h"
#include "extensions/browser/app_window/native_app_window.h"
+#include "services/ui/public/interfaces/window_manager_constants.mojom.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/views/widget/widget.h"
#include "ui/views/widget/widget_delegate.h"
@@ -34,8 +35,7 @@ namespace {
// WidgetDelegateView which allows the widget to be maximized.
class MaximizableWidgetDelegate : public views::WidgetDelegateView {
public:
- MaximizableWidgetDelegate() {
- }
+ MaximizableWidgetDelegate() {}
~MaximizableWidgetDelegate() override {}
bool CanMaximize() const override { return true; }
@@ -141,7 +141,8 @@ IN_PROC_BROWSER_TEST_P(AcceleratorCommandsFullscreenBrowserTest,
// 2) ToggleFullscreen() should have no effect on windows which cannot be
// maximized.
ash::WmWindowAura::GetAuraWindow(window_state->window())
- ->SetProperty(aura::client::kCanMaximizeKey, false);
+ ->SetProperty(aura::client::kResizeBehaviorKey,
+ ui::mojom::kResizeBehaviorNone);
ash::accelerators::ToggleFullscreen();
EXPECT_TRUE(IsInitialShowState(window_state));
« no previous file with comments | « chrome/browser/chromeos/login/ui/login_web_dialog_browsertest.cc ('k') | ui/aura/client/aura_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698