| OLD | NEW |
| 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 "base/keyboard_codes.h" | 8 #include "base/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 668 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 679 bool maximized) { | 679 bool maximized) { |
| 680 } | 680 } |
| 681 virtual bool GetSavedWindowBounds(const std::wstring& window_name, | 681 virtual bool GetSavedWindowBounds(const std::wstring& window_name, |
| 682 gfx::Rect* bounds) const { | 682 gfx::Rect* bounds) const { |
| 683 return false; | 683 return false; |
| 684 } | 684 } |
| 685 virtual bool GetSavedMaximizedState(const std::wstring& window_name, | 685 virtual bool GetSavedMaximizedState(const std::wstring& window_name, |
| 686 bool* maximized) const { | 686 bool* maximized) const { |
| 687 return false; | 687 return false; |
| 688 } | 688 } |
| 689 virtual void NotifyAccessibilityEvent( |
| 690 views::View* view, AccessibilityTypes::Event event_type) {} |
| 689 virtual HICON GetDefaultWindowIcon() const { | 691 virtual HICON GetDefaultWindowIcon() const { |
| 690 return NULL; | 692 return NULL; |
| 691 } | 693 } |
| 692 virtual void AddRef() {} | 694 virtual void AddRef() {} |
| 693 virtual void ReleaseRef() {} | 695 virtual void ReleaseRef() {} |
| 694 | 696 |
| 695 private: | 697 private: |
| 696 mutable scoped_ptr<Clipboard> clipboard_; | 698 mutable scoped_ptr<Clipboard> clipboard_; |
| 697 | 699 |
| 698 DISALLOW_COPY_AND_ASSIGN(TestViewsDelegate); | 700 DISALLOW_COPY_AND_ASSIGN(TestViewsDelegate); |
| (...skipping 643 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1342 #endif | 1344 #endif |
| 1343 } | 1345 } |
| 1344 | 1346 |
| 1345 TEST_F(ViewTest, ChangeNativeViewHierarchyChangeHierarchy) { | 1347 TEST_F(ViewTest, ChangeNativeViewHierarchyChangeHierarchy) { |
| 1346 // TODO(georgey): Fix the test for Linux | 1348 // TODO(georgey): Fix the test for Linux |
| 1347 #if defined(OS_WIN) | 1349 #if defined(OS_WIN) |
| 1348 TestChangeNativeViewHierarchy test(this); | 1350 TestChangeNativeViewHierarchy test(this); |
| 1349 test.CheckChangingHierarhy(); | 1351 test.CheckChangingHierarhy(); |
| 1350 #endif | 1352 #endif |
| 1351 } | 1353 } |
| OLD | NEW |