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

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

Issue 111723012: Linux Aura: Added --use-system-title-bar flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 6 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc ('k') | ui/views/widget/widget.h » ('j') | 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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_screen_x11.h" 5 #include "ui/views/widget/desktop_aura/desktop_screen_x11.h"
6 6
7 #include "base/message_loop/message_loop.h" 7 #include "base/message_loop/message_loop.h"
8 #include "testing/gtest/include/gtest/gtest.h" 8 #include "testing/gtest/include/gtest/gtest.h"
9 #include "ui/gfx/display_observer.h" 9 #include "ui/gfx/display_observer.h"
10 #include "ui/views/test/views_test_base.h" 10 #include "ui/views/test/views_test_base.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 removed_display_.clear(); 50 removed_display_.clear();
51 } 51 }
52 52
53 Widget* BuildTopLevelDesktopWidget(const gfx::Rect& bounds) { 53 Widget* BuildTopLevelDesktopWidget(const gfx::Rect& bounds) {
54 Widget* toplevel = new Widget; 54 Widget* toplevel = new Widget;
55 Widget::InitParams toplevel_params = 55 Widget::InitParams toplevel_params =
56 CreateParams(Widget::InitParams::TYPE_WINDOW); 56 CreateParams(Widget::InitParams::TYPE_WINDOW);
57 toplevel_params.native_widget = 57 toplevel_params.native_widget =
58 new views::DesktopNativeWidgetAura(toplevel); 58 new views::DesktopNativeWidgetAura(toplevel);
59 toplevel_params.bounds = bounds; 59 toplevel_params.bounds = bounds;
60 toplevel_params.remove_standard_frame = true;
60 toplevel->Init(toplevel_params); 61 toplevel->Init(toplevel_params);
61 return toplevel; 62 return toplevel;
62 } 63 }
63 64
64 private: 65 private:
65 // Overridden from gfx::DisplayObserver: 66 // Overridden from gfx::DisplayObserver:
66 virtual void OnDisplayBoundsChanged(const gfx::Display& display) OVERRIDE { 67 virtual void OnDisplayBoundsChanged(const gfx::Display& display) OVERRIDE {
67 changed_display_.push_back(display); 68 changed_display_.push_back(display);
68 } 69 }
69 70
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 screen()->GetDisplayNearestWindow(window_one->GetNativeWindow()).id()); 247 screen()->GetDisplayNearestWindow(window_one->GetNativeWindow()).id());
247 EXPECT_EQ( 248 EXPECT_EQ(
248 kSecondDisplay, 249 kSecondDisplay,
249 screen()->GetDisplayNearestWindow(window_two->GetNativeWindow()).id()); 250 screen()->GetDisplayNearestWindow(window_two->GetNativeWindow()).id());
250 251
251 window_one->CloseNow(); 252 window_one->CloseNow();
252 window_two->CloseNow(); 253 window_two->CloseNow();
253 } 254 }
254 255
255 } // namespace views 256 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc ('k') | ui/views/widget/widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698