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

Side by Side Diff: ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc

Issue 555723003: Add STATE_MAXIMIZED to the list of possible window states in MapWindow(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h" 5 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h"
6 6
7 #include <X11/extensions/shape.h> 7 #include <X11/extensions/shape.h>
8 #include <X11/extensions/XInput2.h> 8 #include <X11/extensions/XInput2.h>
9 #include <X11/Xatom.h> 9 #include <X11/Xatom.h>
10 #include <X11/Xregion.h> 10 #include <X11/Xregion.h>
(...skipping 1533 matching lines...) Expand 10 before | Expand all | Expand 10 after
1544 1544
1545 std::list<XID>& DesktopWindowTreeHostX11::open_windows() { 1545 std::list<XID>& DesktopWindowTreeHostX11::open_windows() {
1546 if (!open_windows_) 1546 if (!open_windows_)
1547 open_windows_ = new std::list<XID>(); 1547 open_windows_ = new std::list<XID>();
1548 return *open_windows_; 1548 return *open_windows_;
1549 } 1549 }
1550 1550
1551 void DesktopWindowTreeHostX11::MapWindow(ui::WindowShowState show_state) { 1551 void DesktopWindowTreeHostX11::MapWindow(ui::WindowShowState show_state) {
1552 if (show_state != ui::SHOW_STATE_DEFAULT && 1552 if (show_state != ui::SHOW_STATE_DEFAULT &&
1553 show_state != ui::SHOW_STATE_NORMAL && 1553 show_state != ui::SHOW_STATE_NORMAL &&
1554 show_state != ui::SHOW_STATE_INACTIVE) { 1554 show_state != ui::SHOW_STATE_INACTIVE &&
1555 show_state != ui::SHOW_STATE_MAXIMIZED) {
1555 // It will behave like SHOW_STATE_NORMAL. 1556 // It will behave like SHOW_STATE_NORMAL.
1556 NOTIMPLEMENTED(); 1557 NOTIMPLEMENTED();
1557 } 1558 }
1558 1559
1559 // Before we map the window, set size hints. Otherwise, some window managers 1560 // Before we map the window, set size hints. Otherwise, some window managers
1560 // will ignore toplevel XMoveWindow commands. 1561 // will ignore toplevel XMoveWindow commands.
1561 XSizeHints size_hints; 1562 XSizeHints size_hints;
1562 size_hints.flags = PPosition; 1563 size_hints.flags = PPosition;
1563 size_hints.x = bounds_.x(); 1564 size_hints.x = bounds_.x();
1564 size_hints.y = bounds_.y(); 1565 size_hints.y = bounds_.y();
(...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after
1926 if (linux_ui) { 1927 if (linux_ui) {
1927 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window); 1928 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window);
1928 if (native_theme) 1929 if (native_theme)
1929 return native_theme; 1930 return native_theme;
1930 } 1931 }
1931 1932
1932 return ui::NativeTheme::instance(); 1933 return ui::NativeTheme::instance();
1933 } 1934 }
1934 1935
1935 } // namespace views 1936 } // namespace views
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698