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

Side by Side Diff: views/view_unittest.cc

Issue 7996008: Get views and views_unittests to build w/ use_aura=1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed review issue Created 9 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 | Annotate | Revision Log
« no previous file with comments | « views/view.cc ('k') | views/views.gyp » ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/string_util.h" 8 #include "base/string_util.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "testing/gmock/include/gmock/gmock.h" 10 #include "testing/gmock/include/gmock/gmock.h"
(...skipping 463 matching lines...) Expand 10 before | Expand all | Expand 10 after
474 // Make sure v4 was not painted 474 // Make sure v4 was not painted
475 tmp_rect.setEmpty(); 475 tmp_rect.setEmpty();
476 CheckRect(v4->last_clip_, tmp_rect); 476 CheckRect(v4->last_clip_, tmp_rect);
477 477
478 window.DestroyWindow(); 478 window.DestroyWindow();
479 } 479 }
480 */ 480 */
481 481
482 #if defined(OS_WIN) 482 #if defined(OS_WIN)
483 TEST_F(ViewTest, RemoveNotification) { 483 TEST_F(ViewTest, RemoveNotification) {
484 #elif defined(TOOLKIT_USES_GTK) 484 #else
485 // TODO(beng): stopped working with widget hierarchy split, 485 // TODO(beng): stopped working with widget hierarchy split,
486 // http://crbug.com/82364 486 // http://crbug.com/82364
487 TEST_F(ViewTest, DISABLED_RemoveNotification) { 487 TEST_F(ViewTest, DISABLED_RemoveNotification) {
488 #endif 488 #endif
489 ViewStorage* vs = ViewStorage::GetInstance(); 489 ViewStorage* vs = ViewStorage::GetInstance();
490 Widget* widget = new Widget; 490 Widget* widget = new Widget;
491 widget->Init(Widget::InitParams(Widget::InitParams::TYPE_POPUP)); 491 widget->Init(Widget::InitParams(Widget::InitParams::TYPE_POPUP));
492 View* root_view = widget->GetRootView(); 492 View* root_view = widget->GetRootView();
493 493
494 View* v1 = new View; 494 View* v1 = new View;
(...skipping 2303 matching lines...) Expand 10 before | Expand all | Expand 10 after
2798 EXPECT_EQ(gfx::Rect(11, 22, 100, 200), widget_view_host->layer()->bounds()); 2798 EXPECT_EQ(gfx::Rect(11, 22, 100, 200), widget_view_host->layer()->bounds());
2799 ASSERT_TRUE(child_view->layer() != NULL); 2799 ASSERT_TRUE(child_view->layer() != NULL);
2800 EXPECT_EQ(gfx::Rect(5, 6, 10, 11), child_view->layer()->bounds()); 2800 EXPECT_EQ(gfx::Rect(5, 6, 10, 11), child_view->layer()->bounds());
2801 2801
2802 child_widget->CloseNow(); 2802 child_widget->CloseNow();
2803 } 2803 }
2804 2804
2805 #endif // VIEWS_COMPOSITOR 2805 #endif // VIEWS_COMPOSITOR
2806 2806
2807 } // namespace views 2807 } // namespace views
OLDNEW
« no previous file with comments | « views/view.cc ('k') | views/views.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698