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

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

Issue 4710001: Split out command IDs from chrome_dll_resource.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 years, 1 month 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/ref_counted_memory.h" 8 #include "base/ref_counted_memory.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/sys_string_conversions.h" 10 #include "base/sys_string_conversions.h"
11 #include "base/utf_string_conversions.h" 11 #include "base/utf_string_conversions.h"
12 #include "chrome/app/chrome_dll_resource.h" 12 #include "chrome/app/chrome_command_ids.h"
13 #include "chrome/browser/browser.h" 13 #include "chrome/browser/browser.h"
14 #include "chrome/browser/cancelable_request.h" 14 #include "chrome/browser/cancelable_request.h"
15 #include "chrome/browser/cocoa/browser_test_helper.h" 15 #include "chrome/browser/cocoa/browser_test_helper.h"
16 #include "chrome/browser/cocoa/cocoa_test_helper.h" 16 #include "chrome/browser/cocoa/cocoa_test_helper.h"
17 #include "chrome/browser/cocoa/history_menu_bridge.h" 17 #include "chrome/browser/cocoa/history_menu_bridge.h"
18 #include "chrome/browser/sessions/tab_restore_service.h" 18 #include "chrome/browser/sessions/tab_restore_service.h"
19 #include "gfx/codec/png_codec.h" 19 #include "gfx/codec/png_codec.h"
20 #include "testing/gmock/include/gmock/gmock.h" 20 #include "testing/gmock/include/gmock/gmock.h"
21 #include "testing/gtest/include/gtest/gtest.h" 21 #include "testing/gtest/include/gtest/gtest.h"
22 #import "testing/gtest_mac.h" 22 #import "testing/gtest_mac.h"
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 // Pretend to be called back. 377 // Pretend to be called back.
378 GotFaviconData(item.icon_handle, true, bytes, false, GURL()); 378 GotFaviconData(item.icon_handle, true, bytes, false, GURL());
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