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 <stddef.h> | 5 #include <stddef.h> |
6 | 6 |
7 #include "chrome/app/chrome_command_ids.h" | 7 #include "chrome/app/chrome_command_ids.h" |
8 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 8 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
9 #include "chrome/browser/ui/browser_command_controller.h" | 9 #include "chrome/browser/ui/browser_command_controller.h" |
10 #include "chrome/browser/ui/browser_commands.h" | 10 #include "chrome/browser/ui/browser_commands.h" |
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
151 EXPECT_EQ(0, controller.GetCurrentEntryIndex()); | 151 EXPECT_EQ(0, controller.GetCurrentEntryIndex()); |
152 EXPECT_EQ(url1, controller.GetEntryAtIndex(0)->GetURL()); | 152 EXPECT_EQ(url1, controller.GetEntryAtIndex(0)->GetURL()); |
153 EXPECT_EQ(view_source_url, controller.GetEntryAtIndex(0)->GetVirtualURL()); | 153 EXPECT_EQ(view_source_url, controller.GetEntryAtIndex(0)->GetVirtualURL()); |
154 EXPECT_FALSE(controller.GetPendingEntry()); | 154 EXPECT_FALSE(controller.GetPendingEntry()); |
155 } | 155 } |
156 | 156 |
157 TEST_F(BrowserCommandsTest, BookmarkCurrentPage) { | 157 TEST_F(BrowserCommandsTest, BookmarkCurrentPage) { |
158 // We use profile() here, since it's a TestingProfile. | 158 // We use profile() here, since it's a TestingProfile. |
159 profile()->CreateBookmarkModel(true); | 159 profile()->CreateBookmarkModel(true); |
160 | 160 |
161 BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile()); | 161 BookmarkModel* model = BookmarkModelFactory::GetForBrowserContext(profile()); |
162 bookmarks::test::WaitForBookmarkModelToLoad(model); | 162 bookmarks::test::WaitForBookmarkModelToLoad(model); |
163 | 163 |
164 // Navigate to a url. | 164 // Navigate to a url. |
165 GURL url1("http://foo/1"); | 165 GURL url1("http://foo/1"); |
166 AddTab(browser(), url1); | 166 AddTab(browser(), url1); |
167 browser()->OpenURL(OpenURLParams( | 167 browser()->OpenURL(OpenURLParams( |
168 url1, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false)); | 168 url1, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false)); |
169 | 169 |
170 chrome::BookmarkCurrentPageAllowingExtensionOverrides(browser()); | 170 chrome::BookmarkCurrentPageAllowingExtensionOverrides(browser()); |
171 | 171 |
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
383 // Change the zoom level. | 383 // Change the zoom level. |
384 zoom::PageZoom::Zoom(tab, content::PAGE_ZOOM_IN); | 384 zoom::PageZoom::Zoom(tab, content::PAGE_ZOOM_IN); |
385 | 385 |
386 EXPECT_FLOAT_EQ(150.0f, zoom_controller->GetZoomPercent()); | 386 EXPECT_FLOAT_EQ(150.0f, zoom_controller->GetZoomPercent()); |
387 | 387 |
388 // Tab no longer at default zoom hence actual size should be enabled. | 388 // Tab no longer at default zoom hence actual size should be enabled. |
389 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_PLUS)); | 389 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_PLUS)); |
390 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_NORMAL)); | 390 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_NORMAL)); |
391 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_MINUS)); | 391 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_MINUS)); |
392 } | 392 } |
OLD | NEW |