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

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

Issue 12335141: Move c/b/ui/search/search.* to c/b/instant/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 7 years, 9 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
OLDNEW
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 #import "chrome/browser/ui/cocoa/browser_window_controller.h" 5 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
6 6
7 #import "base/mac/mac_util.h" 7 #import "base/mac/mac_util.h"
8 #include "base/run_loop.h" 8 #include "base/run_loop.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h" 10 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h"
11 #include "chrome/browser/api/infobars/infobar_service.h" 11 #include "chrome/browser/api/infobars/infobar_service.h"
12 #include "chrome/browser/browser_process.h" 12 #include "chrome/browser/browser_process.h"
13 #include "chrome/browser/instant/search.h"
13 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/browser/profiles/profile_manager.h" 15 #include "chrome/browser/profiles/profile_manager.h"
15 #include "chrome/browser/ui/browser.h" 16 #include "chrome/browser/ui/browser.h"
16 #include "chrome/browser/ui/browser_commands.h" 17 #include "chrome/browser/ui/browser_commands.h"
17 #include "chrome/browser/ui/browser_window.h" 18 #include "chrome/browser/ui/browser_window.h"
18 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h" 19 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h"
19 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h" 20 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h"
20 #import "chrome/browser/ui/cocoa/browser/avatar_button_controller.h" 21 #import "chrome/browser/ui/cocoa/browser/avatar_button_controller.h"
21 #import "chrome/browser/ui/cocoa/fast_resize_view.h" 22 #import "chrome/browser/ui/cocoa/fast_resize_view.h"
22 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h" 23 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
23 #import "chrome/browser/ui/cocoa/nsview_additions.h" 24 #import "chrome/browser/ui/cocoa/nsview_additions.h"
24 #import "chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller.h" 25 #import "chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller.h"
25 #include "chrome/browser/ui/search/search.h"
26 #include "chrome/browser/ui/search/search_model.h" 26 #include "chrome/browser/ui/search/search_model.h"
27 #include "chrome/browser/ui/tabs/tab_strip_model.h" 27 #include "chrome/browser/ui/tabs/tab_strip_model.h"
28 #include "chrome/test/base/in_process_browser_test.h" 28 #include "chrome/test/base/in_process_browser_test.h"
29 #include "content/public/browser/web_contents.h" 29 #include "content/public/browser/web_contents.h"
30 #import "testing/gtest_mac.h" 30 #import "testing/gtest_mac.h"
31 31
32 namespace { 32 namespace {
33 33
34 #if !defined(MAC_OS_X_VERSION_10_7) || \ 34 #if !defined(MAC_OS_X_VERSION_10_7) || \
35 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7 35 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
(...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 441
442 NSView* bookmarkView = [[controller() bookmarkBarController] view]; 442 NSView* bookmarkView = [[controller() bookmarkBarController] view];
443 NSView* contentView = [[controller() window] contentView]; 443 NSView* contentView = [[controller() window] contentView];
444 NSPoint point = [bookmarkView convertPoint:NSMakePoint(1, 1) 444 NSPoint point = [bookmarkView convertPoint:NSMakePoint(1, 1)
445 toView:[contentView superview]]; 445 toView:[contentView superview]];
446 446
447 EXPECT_FALSE([[contentView hitTest:point] isDescendantOf:bookmarkView]); 447 EXPECT_FALSE([[contentView hitTest:point] isDescendantOf:bookmarkView]);
448 EXPECT_TRUE([[contentView hitTest:point] 448 EXPECT_TRUE([[contentView hitTest:point]
449 isDescendantOf:[controller() tabContentArea]]); 449 isDescendantOf:[controller() tabContentArea]]);
450 } 450 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698