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

Side by Side Diff: chrome/browser/ui/cocoa/tabs/tab_controller_unittest.mm

Issue 480693002: Use a qualified path for ui_resources.h grit includes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: REBASE Created 6 years, 4 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 6
7 #import "base/mac/scoped_nsobject.h" 7 #import "base/mac/scoped_nsobject.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/ui/cocoa/cocoa_test_helper.h" 9 #include "chrome/browser/ui/cocoa/cocoa_test_helper.h"
10 #import "chrome/browser/ui/cocoa/tabs/media_indicator_view.h" 10 #import "chrome/browser/ui/cocoa/tabs/media_indicator_view.h"
11 #import "chrome/browser/ui/cocoa/tabs/tab_controller.h" 11 #import "chrome/browser/ui/cocoa/tabs/tab_controller.h"
12 #import "chrome/browser/ui/cocoa/tabs/tab_controller_target.h" 12 #import "chrome/browser/ui/cocoa/tabs/tab_controller_target.h"
13 #import "chrome/browser/ui/cocoa/tabs/tab_strip_drag_controller.h" 13 #import "chrome/browser/ui/cocoa/tabs/tab_strip_drag_controller.h"
14 #import "chrome/browser/ui/cocoa/tabs/tab_view.h" 14 #import "chrome/browser/ui/cocoa/tabs/tab_view.h"
15 #include "grit/theme_resources.h" 15 #include "grit/theme_resources.h"
16 #include "grit/ui_resources.h"
17 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
18 #import "testing/gtest_mac.h" 17 #import "testing/gtest_mac.h"
19 #include "testing/platform_test.h" 18 #include "testing/platform_test.h"
20 #include "ui/base/resource/resource_bundle.h" 19 #include "ui/base/resource/resource_bundle.h"
20 #include "ui/resources/grit/ui_resources.h"
21 21
22 // Implements the target interface for the tab, which gets sent messages when 22 // Implements the target interface for the tab, which gets sent messages when
23 // the tab is clicked on by the user and when its close box is clicked. 23 // the tab is clicked on by the user and when its close box is clicked.
24 @interface TabControllerTestTarget : NSObject<TabControllerTarget> { 24 @interface TabControllerTestTarget : NSObject<TabControllerTarget> {
25 @private 25 @private
26 bool selected_; 26 bool selected_;
27 bool closed_; 27 bool closed_;
28 base::scoped_nsobject<TabStripDragController> dragController_; 28 base::scoped_nsobject<TabStripDragController> dragController_;
29 } 29 }
30 - (bool)selected; 30 - (bool)selected;
(...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after
533 [[controller view] setFrame:tabFrame]; 533 [[controller view] setFrame:tabFrame];
534 CheckForExpectedLayoutAndVisibilityOfSubviews(controller); 534 CheckForExpectedLayoutAndVisibilityOfSubviews(controller);
535 --tabFrame.size.width; 535 --tabFrame.size.width;
536 } 536 }
537 } 537 }
538 } 538 }
539 } 539 }
540 } 540 }
541 541
542 } // namespace 542 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.mm ('k') | chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698