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

Side by Side Diff: views/view_unittest.cc

Issue 5685007: Rename all methods accessing Singleton<T> as GetInstance(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 10 years 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/focus/view_storage.cc ('k') | views/widget/root_view.cc » ('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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "app/clipboard/clipboard.h" 7 #include "app/clipboard/clipboard.h"
8 #include "app/keyboard_codes.h" 8 #include "app/keyboard_codes.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
(...skipping 598 matching lines...) Expand 10 before | Expand all | Expand 10 after
609 609
610 // Make sure v4 was not painted 610 // Make sure v4 was not painted
611 tmp_rect.setEmpty(); 611 tmp_rect.setEmpty();
612 CheckRect(v4->last_clip_, tmp_rect); 612 CheckRect(v4->last_clip_, tmp_rect);
613 613
614 window.DestroyWindow(); 614 window.DestroyWindow();
615 } 615 }
616 */ 616 */
617 617
618 TEST_F(ViewTest, RemoveNotification) { 618 TEST_F(ViewTest, RemoveNotification) {
619 views::ViewStorage* vs = views::ViewStorage::GetSharedInstance(); 619 views::ViewStorage* vs = views::ViewStorage::GetInstance();
620 views::Widget* window = CreateWidget(); 620 views::Widget* window = CreateWidget();
621 views::RootView* root_view = window->GetRootView(); 621 views::RootView* root_view = window->GetRootView();
622 622
623 View* v1 = new View; 623 View* v1 = new View;
624 int s1 = vs->CreateStorageID(); 624 int s1 = vs->CreateStorageID();
625 vs->StoreView(s1, v1); 625 vs->StoreView(s1, v1);
626 root_view->AddChildView(v1); 626 root_view->AddChildView(v1);
627 View* v11 = new View; 627 View* v11 = new View;
628 int s11 = vs->CreateStorageID(); 628 int s11 = vs->CreateStorageID();
629 vs->StoreView(s11, v11); 629 vs->StoreView(s11, v11);
(...skipping 863 matching lines...) Expand 10 before | Expand all | Expand 10 after
1493 #endif 1493 #endif
1494 } 1494 }
1495 1495
1496 TEST_F(ViewTest, ChangeNativeViewHierarchyChangeHierarchy) { 1496 TEST_F(ViewTest, ChangeNativeViewHierarchyChangeHierarchy) {
1497 // TODO(georgey): Fix the test for Linux 1497 // TODO(georgey): Fix the test for Linux
1498 #if defined(OS_WIN) 1498 #if defined(OS_WIN)
1499 TestChangeNativeViewHierarchy test(this); 1499 TestChangeNativeViewHierarchy test(this);
1500 test.CheckChangingHierarhy(); 1500 test.CheckChangingHierarhy();
1501 #endif 1501 #endif
1502 } 1502 }
OLDNEW
« no previous file with comments | « views/focus/view_storage.cc ('k') | views/widget/root_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698