| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/avatar_menu_button.h" | 5 #include "chrome/browser/ui/views/profiles/avatar_menu_button.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 10 #include "chrome/browser/profiles/profile_manager.h" | 10 #include "chrome/browser/profiles/profile_manager.h" |
| 11 #include "chrome/browser/profiles/profiles_state.h" | 11 #include "chrome/browser/profiles/profiles_state.h" |
| 12 #include "chrome/browser/ui/browser_list.h" | 12 #include "chrome/browser/ui/browser_list.h" |
| 13 #include "chrome/browser/ui/views/avatar_menu_bubble_view.h" | |
| 14 #include "chrome/browser/ui/views/frame/browser_view.h" | 13 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 14 #include "chrome/browser/ui/views/profiles/avatar_menu_bubble_view.h" |
| 15 #include "chrome/common/chrome_paths.h" | 15 #include "chrome/common/chrome_paths.h" |
| 16 #include "chrome/common/chrome_switches.h" | 16 #include "chrome/common/chrome_switches.h" |
| 17 #include "chrome/test/base/in_process_browser_test.h" | 17 #include "chrome/test/base/in_process_browser_test.h" |
| 18 #include "chrome/test/base/test_switches.h" | 18 #include "chrome/test/base/test_switches.h" |
| 19 #include "chrome/test/base/testing_browser_process.h" | 19 #include "chrome/test/base/testing_browser_process.h" |
| 20 #include "grit/generated_resources.h" | 20 #include "grit/generated_resources.h" |
| 21 | 21 |
| 22 class AvatarMenuButtonTest : public InProcessBrowserTest { | 22 class AvatarMenuButtonTest : public InProcessBrowserTest { |
| 23 public: | 23 public: |
| 24 AvatarMenuButtonTest(); | 24 AvatarMenuButtonTest(); |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 // Verify that clicking again doesn't reshow it. | 99 // Verify that clicking again doesn't reshow it. |
| 100 AvatarMenuButton* button = GetAvatarMenuButton(); | 100 AvatarMenuButton* button = GetAvatarMenuButton(); |
| 101 static_cast<views::MenuButtonListener*>(button)->OnMenuButtonClicked( | 101 static_cast<views::MenuButtonListener*>(button)->OnMenuButtonClicked( |
| 102 NULL, gfx::Point()); | 102 NULL, gfx::Point()); |
| 103 // Hide the bubble manually. In the browser this would normally happen during | 103 // Hide the bubble manually. In the browser this would normally happen during |
| 104 // the event processing. | 104 // the event processing. |
| 105 AvatarMenuBubbleView::Hide(); | 105 AvatarMenuBubbleView::Hide(); |
| 106 base::MessageLoop::current()->RunUntilIdle(); | 106 base::MessageLoop::current()->RunUntilIdle(); |
| 107 EXPECT_FALSE(AvatarMenuBubbleView::IsShowing()); | 107 EXPECT_FALSE(AvatarMenuBubbleView::IsShowing()); |
| 108 } | 108 } |
| OLD | NEW |