chrome/browser/ui/cocoa/framed_browser_window.mm - Issue 595283002: Move nsview_additions and hyperlink_text_view to ui/base/cocoa

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

Issue 595283002: Move nsview_additions and hyperlink_text_view to ui/base/cocoa (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 6 years, 3 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

« no previous file with comments | « chrome/browser/ui/cocoa/find_bar/find_bar_view.mm ('k') | chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm » ('j') | chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/framed_browser_window.h"	5 #import "chrome/browser/ui/cocoa/framed_browser_window.h"

6	6

7 #include "base/logging.h"	7 #include "base/logging.h"

8 #include "base/mac/sdk_forward_declarations.h"	8 #include "base/mac/sdk_forward_declarations.h"

9 #include "chrome/browser/global_keyboard_shortcuts_mac.h"	9 #include "chrome/browser/global_keyboard_shortcuts_mac.h"

10 #include "chrome/browser/profiles/profile_avatar_icon_util.h"	10 #include "chrome/browser/profiles/profile_avatar_icon_util.h"

	11 #include "chrome/browser/themes/theme_properties.h"

	12 #include "chrome/browser/themes/theme_service.h"

11 #import "chrome/browser/ui/cocoa/browser_window_controller.h"	13 #import "chrome/browser/ui/cocoa/browser_window_controller.h"

12 #import "chrome/browser/ui/cocoa/browser_window_utils.h"	14 #import "chrome/browser/ui/cocoa/browser_window_utils.h"

13 #import "chrome/browser/ui/cocoa/custom_frame_view.h"	15 #import "chrome/browser/ui/cocoa/custom_frame_view.h"

14 #import "chrome/browser/ui/cocoa/nsview_additions.h"

15 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"	16 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"

16 #import "chrome/browser/ui/cocoa/themed_window.h"	17 #import "chrome/browser/ui/cocoa/themed_window.h"

17 #include "chrome/browser/themes/theme_properties.h"

18 #include "chrome/browser/themes/theme_service.h"

19 #include "grit/theme_resources.h"	18 #include "grit/theme_resources.h"

20 #include "ui/base/cocoa/nsgraphics_context_additions.h"	19 #include "ui/base/cocoa/nsgraphics_context_additions.h"

	20 #import "ui/base/cocoa/nsview_additions.h"

21	21

22 // Implementer's note: Moving the window controls is tricky. When altering the	22 // Implementer's note: Moving the window controls is tricky. When altering the

23 // code, ensure that:	23 // code, ensure that:

24 // - accessibility hit testing works	24 // - accessibility hit testing works

25 // - the accessibility hierarchy is correct	25 // - the accessibility hierarchy is correct

26 // - close/min in the background don't bring the window forward	26 // - close/min in the background don't bring the window forward

27 // - rollover effects work correctly	27 // - rollover effects work correctly

28	28

29 namespace {	29 namespace {

30	30

(...skipping 456 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
487 ThemedWindowStyle windowStyle = [self themedWindowStyle];	487 ThemedWindowStyle windowStyle = [self themedWindowStyle];

488 BOOL incognito = windowStyle & THEMED_INCOGNITO;	488 BOOL incognito = windowStyle & THEMED_INCOGNITO;

489	489

490 if (incognito)	490 if (incognito)

491 return [NSColor whiteColor];	491 return [NSColor whiteColor];

492 else	492 else

493 return [NSColor windowFrameTextColor];	493 return [NSColor windowFrameTextColor];

494 }	494 }

495	495

496 @end	496 @end

OLD	NEW