chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc - Issue 6598086: Update more includes that were pointing to the old locations.

Side by Side Diff: chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc

Issue 6598086: Update more includes that were pointing to the old locations. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: sync Created 9 years, 9 months 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 | « chrome/browser/ui/toolbar/back_forward_menu_model.cc ('k') | chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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/string_number_conversions.h"	5 #include "base/string_number_conversions.h"

6 #include "base/utf_string_conversions.h"	6 #include "base/utf_string_conversions.h"

7 #include "chrome/app/chrome_command_ids.h"	7 #include "chrome/app/chrome_command_ids.h"

8 #include "chrome/browser/automation/ui_controls.h"	8 #include "chrome/browser/automation/ui_controls.h"

9 #include "chrome/browser/bookmarks/bookmark_model.h"	9 #include "chrome/browser/bookmarks/bookmark_model.h"

10 #include "chrome/browser/bookmarks/bookmark_utils.h"	10 #include "chrome/browser/bookmarks/bookmark_utils.h"

11 #include "chrome/browser/prefs/pref_service.h"	11 #include "chrome/browser/prefs/pref_service.h"

12 #include "chrome/browser/profiles/profile.h"	12 #include "chrome/browser/profiles/profile.h"

13 #include "chrome/browser/tab_contents/page_navigator.h"

14 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"	13 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"

15 #include "chrome/common/notification_service.h"	14 #include "chrome/common/notification_service.h"

16 #include "chrome/common/pref_names.h"	15 #include "chrome/common/pref_names.h"

17 #include "chrome/test/interactive_ui/view_event_test_base.h"	16 #include "chrome/test/interactive_ui/view_event_test_base.h"

18 #include "chrome/test/testing_profile.h"	17 #include "chrome/test/testing_profile.h"

19 #include "chrome/test/ui_test_utils.h"	18 #include "chrome/test/ui_test_utils.h"

	19 #include "content/browser/tab_contents/page_navigator.h"

20 #include "grit/generated_resources.h"	20 #include "grit/generated_resources.h"

21 #include "ui/base/clipboard/clipboard.h"	21 #include "ui/base/clipboard/clipboard.h"

22 #include "ui/base/keycodes/keyboard_codes.h"	22 #include "ui/base/keycodes/keyboard_codes.h"

23 #include "views/controls/button/menu_button.h"	23 #include "views/controls/button/menu_button.h"

24 #include "views/controls/button/text_button.h"	24 #include "views/controls/button/text_button.h"

25 #include "views/controls/menu/menu_controller.h"	25 #include "views/controls/menu/menu_controller.h"

26 #include "views/controls/menu/menu_item_view.h"	26 #include "views/controls/menu/menu_item_view.h"

27 #include "views/controls/menu/submenu_view.h"	27 #include "views/controls/menu/submenu_view.h"

28 #include "views/views_delegate.h"	28 #include "views/views_delegate.h"

29 #include "views/window/window.h"	29 #include "views/window/window.h"

(...skipping 1325 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1355 ASSERT_TRUE(button->state() == views::CustomButton::BS_PUSHED);	1355 ASSERT_TRUE(button->state() == views::CustomButton::BS_PUSHED);

1356	1356

1357 // Close the window.	1357 // Close the window.

1358 window_->Close();	1358 window_->Close();

1359 window_ = NULL;	1359 window_ = NULL;

1360 }	1360 }

1361 };	1361 };

1362	1362

1363 // Disabled, http://crbug.com/64303.	1363 // Disabled, http://crbug.com/64303.

1364 VIEW_TEST(BookmarkBarViewTest16, DISABLED_DeleteMenu)	1364 VIEW_TEST(BookmarkBarViewTest16, DISABLED_DeleteMenu)

OLD	NEW