| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "chrome/browser/ui/views/toolbar/browser_actions_container.h" | 5 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h" |
| 6 | 6 |
| 7 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h" | 7 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h" |
| 8 #include "chrome/browser/extensions/browser_action_test_util.h" | 8 #include "chrome/browser/extensions/browser_action_test_util.h" |
| 9 #include "chrome/browser/extensions/extension_toolbar_model.h" | 9 #include "chrome/browser/extensions/extension_toolbar_model.h" |
| 10 #include "chrome/browser/ui/browser_window.h" | 10 #include "chrome/browser/ui/browser_window.h" |
| (...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 252 BrowserActionsContainer* main_bar_; | 252 BrowserActionsContainer* main_bar_; |
| 253 | 253 |
| 254 // A parent view for the overflow menu. | 254 // A parent view for the overflow menu. |
| 255 scoped_ptr<views::View> overflow_parent_; | 255 scoped_ptr<views::View> overflow_parent_; |
| 256 | 256 |
| 257 // The overflow BrowserActionsContainer. We manufacture this so that we don't | 257 // The overflow BrowserActionsContainer. We manufacture this so that we don't |
| 258 // have to open the wrench menu. | 258 // have to open the wrench menu. |
| 259 // Owned by the |overflow_parent_|. | 259 // Owned by the |overflow_parent_|. |
| 260 BrowserActionsContainer* overflow_bar_; | 260 BrowserActionsContainer* overflow_bar_; |
| 261 | 261 |
| 262 // The associated toolbar model. | |
| 263 extensions::ExtensionToolbarModel* model_; | |
| 264 | |
| 265 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainerOverflowTest); | 262 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainerOverflowTest); |
| 266 }; | 263 }; |
| 267 | 264 |
| 268 void BrowserActionsContainerOverflowTest::SetUpOnMainThread() { | 265 void BrowserActionsContainerOverflowTest::SetUpOnMainThread() { |
| 269 BrowserActionsBarBrowserTest::SetUpOnMainThread(); | 266 BrowserActionsBarBrowserTest::SetUpOnMainThread(); |
| 270 main_bar_ = BrowserView::GetBrowserViewForBrowser(browser()) | 267 main_bar_ = BrowserView::GetBrowserViewForBrowser(browser()) |
| 271 ->toolbar()->browser_actions(); | 268 ->toolbar()->browser_actions(); |
| 272 overflow_parent_.reset(new views::View()); | 269 overflow_parent_.reset(new views::View()); |
| 273 overflow_parent_->set_owned_by_client(); | 270 overflow_parent_->set_owned_by_client(); |
| 274 overflow_bar_ = new BrowserActionsContainer(browser(), main_bar_); | 271 overflow_bar_ = new BrowserActionsContainer(browser(), main_bar_); |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 429 | 426 |
| 430 main_bar()->OnDragUpdated(target_event3); | 427 main_bar()->OnDragUpdated(target_event3); |
| 431 main_bar()->OnPerformDrop(target_event3); | 428 main_bar()->OnPerformDrop(target_event3); |
| 432 | 429 |
| 433 // Order should be A C B, and there should be no extensions in overflow. | 430 // Order should be A C B, and there should be no extensions in overflow. |
| 434 EXPECT_EQ(extension_a()->id(), main_bar()->GetIdAt(0u)); | 431 EXPECT_EQ(extension_a()->id(), main_bar()->GetIdAt(0u)); |
| 435 EXPECT_EQ(extension_c()->id(), main_bar()->GetIdAt(1u)); | 432 EXPECT_EQ(extension_c()->id(), main_bar()->GetIdAt(1u)); |
| 436 EXPECT_EQ(extension_b()->id(), main_bar()->GetIdAt(2u)); | 433 EXPECT_EQ(extension_b()->id(), main_bar()->GetIdAt(2u)); |
| 437 EXPECT_TRUE(VerifyVisibleCount(3u)); | 434 EXPECT_TRUE(VerifyVisibleCount(3u)); |
| 438 } | 435 } |
| OLD | NEW |