| 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 "base/keyboard_codes.h" | 5 #include "base/keyboard_codes.h" |
| 6 #include "base/string_util.h" | 6 #include "base/string_util.h" |
| 7 #include "chrome/browser/automation/ui_controls.h" | 7 #include "chrome/browser/automation/ui_controls.h" |
| 8 #include "chrome/browser/bookmarks/bookmark_model.h" | 8 #include "chrome/browser/bookmarks/bookmark_model.h" |
| 9 #include "chrome/browser/bookmarks/bookmark_utils.h" | 9 #include "chrome/browser/bookmarks/bookmark_utils.h" |
| 10 #include "chrome/browser/pref_service.h" | 10 #include "chrome/browser/pref_service.h" |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 bool maximized) {} | 63 bool maximized) {} |
| 64 virtual bool GetSavedWindowBounds(const std::wstring& window_name, | 64 virtual bool GetSavedWindowBounds(const std::wstring& window_name, |
| 65 gfx::Rect* bounds) const { | 65 gfx::Rect* bounds) const { |
| 66 return false; | 66 return false; |
| 67 } | 67 } |
| 68 virtual bool GetSavedMaximizedState(const std::wstring& window_name, | 68 virtual bool GetSavedMaximizedState(const std::wstring& window_name, |
| 69 bool* maximized) const { | 69 bool* maximized) const { |
| 70 return false; | 70 return false; |
| 71 } | 71 } |
| 72 | 72 |
| 73 virtual void NotifyAccessibilityEvent( |
| 74 views::View* view, AccessibilityTypes::Event event_type) {} |
| 75 |
| 73 #if defined(OS_WIN) | 76 #if defined(OS_WIN) |
| 74 virtual HICON GetDefaultWindowIcon() const { return 0; } | 77 virtual HICON GetDefaultWindowIcon() const { return 0; } |
| 75 #endif | 78 #endif |
| 76 | 79 |
| 77 virtual void AddRef() { | 80 virtual void AddRef() { |
| 78 } | 81 } |
| 79 | 82 |
| 80 virtual void ReleaseRef() { | 83 virtual void ReleaseRef() { |
| 81 MessageLoopForUI::current()->Quit(); | 84 MessageLoopForUI::current()->Quit(); |
| 82 } | 85 } |
| (...skipping 1252 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1335 views::TextButton* button = bb_view_->GetBookmarkButton(0); | 1338 views::TextButton* button = bb_view_->GetBookmarkButton(0); |
| 1336 ASSERT_TRUE(button->state() == views::CustomButton::BS_PUSHED); | 1339 ASSERT_TRUE(button->state() == views::CustomButton::BS_PUSHED); |
| 1337 | 1340 |
| 1338 // Close the window. | 1341 // Close the window. |
| 1339 window_->Close(); | 1342 window_->Close(); |
| 1340 window_ = NULL; | 1343 window_ = NULL; |
| 1341 } | 1344 } |
| 1342 }; | 1345 }; |
| 1343 | 1346 |
| 1344 VIEW_TEST(BookmarkBarViewTest16, DeleteMenu) | 1347 VIEW_TEST(BookmarkBarViewTest16, DeleteMenu) |
| OLD | NEW |