chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm - Issue 229163004: [Mac] Move profile related UI from cocoa/browser to cocoa/profiles

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

Issue 229163004: [Mac] Move profile related UI from cocoa/browser to cocoa/profiles (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: oops forgot a comment Created 6 years, 8 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

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 #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/strings/utf_string_conversions.h"	9 #include "base/strings/utf_string_conversions.h"

10 #include "chrome/browser/browser_process.h"	10 #include "chrome/browser/browser_process.h"

11 #include "chrome/browser/devtools/devtools_window.h"	11 #include "chrome/browser/devtools/devtools_window.h"

12 #include "chrome/browser/infobars/infobar_service.h"	12 #include "chrome/browser/infobars/infobar_service.h"

13 #include "chrome/browser/infobars/simple_alert_infobar_delegate.h"	13 #include "chrome/browser/infobars/simple_alert_infobar_delegate.h"

14 #include "chrome/browser/profiles/profile.h"	14 #include "chrome/browser/profiles/profile.h"

15 #include "chrome/browser/profiles/profile_manager.h"	15 #include "chrome/browser/profiles/profile_manager.h"

16 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"	16 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"

17 #include "chrome/browser/ui/browser.h"	17 #include "chrome/browser/ui/browser.h"

18 #include "chrome/browser/ui/browser_commands.h"	18 #include "chrome/browser/ui/browser_commands.h"

19 #include "chrome/browser/ui/browser_list.h"	19 #include "chrome/browser/ui/browser_list.h"

20 #include "chrome/browser/ui/browser_window.h"	20 #include "chrome/browser/ui/browser_window.h"

21 #import "chrome/browser/ui/cocoa/browser/avatar_base_controller.h"

22 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h"	21 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h"

23 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h"	22 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h"

24 #import "chrome/browser/ui/cocoa/fast_resize_view.h"	23 #import "chrome/browser/ui/cocoa/fast_resize_view.h"

25 #import "chrome/browser/ui/cocoa/history_overlay_controller.h"	24 #import "chrome/browser/ui/cocoa/history_overlay_controller.h"

26 #import "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h"	25 #import "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h"

27 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"	26 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"

28 #import "chrome/browser/ui/cocoa/nsview_additions.h"	27 #import "chrome/browser/ui/cocoa/nsview_additions.h"

	28 #import "chrome/browser/ui/cocoa/profiles/avatar_base_controller.h"

29 #import "chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller.h"	29 #import "chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller.h"

30 #include "chrome/browser/ui/extensions/application_launch.h"	30 #include "chrome/browser/ui/extensions/application_launch.h"

31 #include "chrome/browser/ui/find_bar/find_bar_controller.h"	31 #include "chrome/browser/ui/find_bar/find_bar_controller.h"

32 #include "chrome/browser/ui/find_bar/find_bar.h"	32 #include "chrome/browser/ui/find_bar/find_bar.h"

33 #include "chrome/browser/ui/tabs/tab_strip_model.h"	33 #include "chrome/browser/ui/tabs/tab_strip_model.h"

34 #include "chrome/test/base/in_process_browser_test.h"	34 #include "chrome/test/base/in_process_browser_test.h"

35 #include "chrome/test/base/testing_profile.h"	35 #include "chrome/test/base/testing_profile.h"

36 #include "content/public/browser/web_contents.h"	36 #include "content/public/browser/web_contents.h"

37 #include "content/public/browser/web_contents_view.h"	37 #include "content/public/browser/web_contents_view.h"

38 #import "testing/gtest_mac.h"	38 #import "testing/gtest_mac.h"

(...skipping 335 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
374 StatusBubblePositioning) {	374 StatusBubblePositioning) {

375 NSPoint origin = [controller() statusBubbleBaseFrame].origin;	375 NSPoint origin = [controller() statusBubbleBaseFrame].origin;

376	376

377 DevToolsWindow* devtools_window = DevToolsWindow::OpenDevToolsWindowForTest(	377 DevToolsWindow* devtools_window = DevToolsWindow::OpenDevToolsWindowForTest(

378 browser(), true);	378 browser(), true);

379 SetDevToolsWindowContentsInsets(devtools_window, 10, 10, 10, 10);	379 SetDevToolsWindowContentsInsets(devtools_window, 10, 10, 10, 10);

380	380

381 NSPoint originWithDevTools = [controller() statusBubbleBaseFrame].origin;	381 NSPoint originWithDevTools = [controller() statusBubbleBaseFrame].origin;

382 EXPECT_FALSE(NSEqualPoints(origin, originWithDevTools));	382 EXPECT_FALSE(NSEqualPoints(origin, originWithDevTools));

383 }	383 }

OLD	NEW