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

Side by Side Diff: ui/views/view_unittest.cc

Issue 10821083: views: Enable ViewTest.RemoveNotification on Linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rm TODO Created 8 years, 4 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 | « 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 <map> 5 #include <map>
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/rand_util.h" 8 #include "base/rand_util.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 800 matching lines...) Expand 10 before | Expand all | Expand 10 after
811 CheckRect(v1->last_clip_, tmp_rect); 811 CheckRect(v1->last_clip_, tmp_rect);
812 812
813 // Make sure v4 was not painted 813 // Make sure v4 was not painted
814 tmp_rect.setEmpty(); 814 tmp_rect.setEmpty();
815 CheckRect(v4->last_clip_, tmp_rect); 815 CheckRect(v4->last_clip_, tmp_rect);
816 816
817 window.DestroyWindow(); 817 window.DestroyWindow();
818 } 818 }
819 */ 819 */
820 820
821 #if defined(OS_WIN)
822 TEST_F(ViewTest, RemoveNotification) { 821 TEST_F(ViewTest, RemoveNotification) {
823 #else
824 // TODO(beng): stopped working with widget hierarchy split,
825 // http://crbug.com/82364
826 TEST_F(ViewTest, DISABLED_RemoveNotification) {
827 #endif
828 ViewStorage* vs = ViewStorage::GetInstance(); 822 ViewStorage* vs = ViewStorage::GetInstance();
829 Widget* widget = new Widget; 823 Widget* widget = new Widget;
830 widget->Init(Widget::InitParams(Widget::InitParams::TYPE_POPUP)); 824 widget->Init(Widget::InitParams(Widget::InitParams::TYPE_POPUP));
831 View* root_view = widget->GetRootView(); 825 View* root_view = widget->GetRootView();
832 826
833 View* v1 = new View; 827 View* v1 = new View;
834 int s1 = vs->CreateStorageID(); 828 int s1 = vs->CreateStorageID();
835 vs->StoreView(s1, v1); 829 vs->StoreView(s1, v1);
836 root_view->AddChildView(v1); 830 root_view->AddChildView(v1);
837 View* v11 = new View; 831 View* v11 = new View;
(...skipping 2505 matching lines...) Expand 10 before | Expand all | Expand 10 after
3343 // Set to non default value. 3337 // Set to non default value.
3344 v->layer()->set_scale_content(false); 3338 v->layer()->set_scale_content(false);
3345 scoped_ptr<ui::Layer> old_layer(v->RecreateLayer()); 3339 scoped_ptr<ui::Layer> old_layer(v->RecreateLayer());
3346 ui::Layer* new_layer = v->layer(); 3340 ui::Layer* new_layer = v->layer();
3347 EXPECT_EQ(false, new_layer->scale_content()); 3341 EXPECT_EQ(false, new_layer->scale_content());
3348 } 3342 }
3349 3343
3350 #endif // USE_AURA 3344 #endif // USE_AURA
3351 3345
3352 } // namespace views 3346 } // 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