Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(24)

Side by Side Diff: chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm

Issue 8253002: Move PageTransition into content namespace. While I'm touching all these files, I've also updated... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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
OLDNEW
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 #import <Cocoa/Cocoa.h> 5 #import <Cocoa/Cocoa.h>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/memory/ref_counted_memory.h" 8 #include "base/memory/ref_counted_memory.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 item->title = title; 87 item->title = title;
88 item->url = GURL(title); 88 item->url = GURL(title);
89 return item; 89 return item;
90 } 90 }
91 91
92 MockTRS::Tab CreateSessionTab(const GURL& url, const string16& title) { 92 MockTRS::Tab CreateSessionTab(const GURL& url, const string16& title) {
93 MockTRS::Tab tab; 93 MockTRS::Tab tab;
94 tab.current_navigation_index = 0; 94 tab.current_navigation_index = 0;
95 tab.navigations.push_back( 95 tab.navigations.push_back(
96 TabNavigation(0, url, GURL(), title, std::string(), 96 TabNavigation(0, url, GURL(), title, std::string(),
97 PageTransition::LINK)); 97 content::PAGE_TRANSITION_LINK));
98 return tab; 98 return tab;
99 } 99 }
100 100
101 void GetFaviconForHistoryItem(HistoryMenuBridge::HistoryItem* item) { 101 void GetFaviconForHistoryItem(HistoryMenuBridge::HistoryItem* item) {
102 bridge_->GetFaviconForHistoryItem(item); 102 bridge_->GetFaviconForHistoryItem(item);
103 } 103 }
104 104
105 void GotFaviconData(FaviconService::Handle handle, 105 void GotFaviconData(FaviconService::Handle handle,
106 history::FaviconData favicon) { 106 history::FaviconData favicon) {
107 bridge_->GotFaviconData(handle, favicon); 107 bridge_->GotFaviconData(handle, favicon);
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 favicon.icon_type = history::FAVICON; 377 favicon.icon_type = history::FAVICON;
378 GotFaviconData(item.icon_handle, favicon); 378 GotFaviconData(item.icon_handle, favicon);
379 379
380 // Make sure the callback works. 380 // Make sure the callback works.
381 EXPECT_FALSE(item.icon_requested); 381 EXPECT_FALSE(item.icon_requested);
382 EXPECT_TRUE(item.icon.get()); 382 EXPECT_TRUE(item.icon.get());
383 EXPECT_TRUE([item.menu_item image]); 383 EXPECT_TRUE([item.menu_item image]);
384 } 384 }
385 385
386 } // namespace 386 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698