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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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 side-by-side diff with in-line comments

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')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/framed_browser_window.mm

diff --git a/chrome/browser/ui/cocoa/framed_browser_window.mm b/chrome/browser/ui/cocoa/framed_browser_window.mm

index 0989b6a543f296e73e36b5b2484fd6ef7cd14ef1..78a2079483b17ba4a5062b47af3eef4feb546e42 100644

--- a/chrome/browser/ui/cocoa/framed_browser_window.mm

+++ b/chrome/browser/ui/cocoa/framed_browser_window.mm

@@ -8,16 +8,16 @@

#include "base/mac/sdk_forward_declarations.h"

#include "chrome/browser/global_keyboard_shortcuts_mac.h"

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

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

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

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

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

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

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

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

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

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

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

#include "grit/theme_resources.h"

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

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

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

// code, ensure that: