| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "build/build_config.h" |
| 5 #include "chrome/app/chrome_command_ids.h" | 6 #include "chrome/app/chrome_command_ids.h" |
| 6 #include "chrome/browser/extensions/api/commands/command_service.h" | 7 #include "chrome/browser/extensions/api/commands/command_service.h" |
| 7 #include "chrome/browser/extensions/extension_apitest.h" | 8 #include "chrome/browser/extensions/extension_apitest.h" |
| 8 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
| 9 #include "chrome/browser/ui/browser_commands.h" | 10 #include "chrome/browser/ui/browser_commands.h" |
| 10 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 11 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 11 #include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h" | 12 #include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h" |
| 12 #include "chrome/browser/ui/views/frame/browser_view.h" | 13 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 13 #include "chrome/browser/ui/views/location_bar/star_view.h" | 14 #include "chrome/browser/ui/views/location_bar/star_view.h" |
| 14 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" | 15 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 command_service->UpdateKeybindingPrefs( | 83 command_service->UpdateKeybindingPrefs( |
| 83 extension->id(), extensions::manifest_values::kBrowserActionCommandEvent, | 84 extension->id(), extensions::manifest_values::kBrowserActionCommandEvent, |
| 84 kBookmarkKeybinding); | 85 kBookmarkKeybinding); |
| 85 | 86 |
| 86 // Check that the BookmarkBubbleView is shown when executing | 87 // Check that the BookmarkBubbleView is shown when executing |
| 87 // IDC_BOOKMARK_PAGE. | 88 // IDC_BOOKMARK_PAGE. |
| 88 EXPECT_FALSE(BookmarkBubbleView::bookmark_bubble()); | 89 EXPECT_FALSE(BookmarkBubbleView::bookmark_bubble()); |
| 89 chrome::ExecuteCommand(browser(), IDC_BOOKMARK_PAGE); | 90 chrome::ExecuteCommand(browser(), IDC_BOOKMARK_PAGE); |
| 90 EXPECT_TRUE(BookmarkBubbleView::bookmark_bubble()); | 91 EXPECT_TRUE(BookmarkBubbleView::bookmark_bubble()); |
| 91 } | 92 } |
| OLD | NEW |