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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/mus/root_window_controller.cc

Issue 2150933003: mash: Add touch-hud app. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: test Created 4 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
« no previous file with comments | « ash/mus/BUILD.gn ('k') | ash/mus/root_window_controller_unittest.cc » ('j') | ash/mus/root_window_controller_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/root_window_controller.cc
diff --git a/ash/mus/root_window_controller.cc b/ash/mus/root_window_controller.cc
index ea935decc0f38a6554e01b58394a4eb59cd536fc..1729501432e9ebff22d9a197b733e12b40dbe717 100644
--- a/ash/mus/root_window_controller.cc
+++ b/ash/mus/root_window_controller.cc
@@ -183,6 +183,14 @@ gfx::Rect RootWindowController::CalculateDefaultBounds(
::ui::mojom::WindowManager::kInitialBounds_Property);
}
+ if (window->HasSharedProperty(
+ ::ui::mojom::WindowManager::kShowState_Property) &&
+ static_cast<::ui::mojom::ShowState>(window->GetSharedProperty<int32_t>(
sky 2016/07/21 20:00:02 Use GetWindowShowState in property_util
riajiang 2016/07/21 20:13:51 Done.
+ ::ui::mojom::WindowManager::kShowState_Property)) ==
+ ui::mojom::ShowState::FULLSCREEN) {
+ return gfx::Rect(0, 0, root_->bounds().width(), root_->bounds().height());
+ }
+
int width, height;
const gfx::Size pref = GetWindowPreferredSize(window);
if (pref.IsEmpty()) {
« no previous file with comments | « ash/mus/BUILD.gn ('k') | ash/mus/root_window_controller_unittest.cc » ('j') | ash/mus/root_window_controller_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698