chrome/browser/ui/views/chrome_views_delegate.cc - Issue 659233002: STASH: Epic Experimental patch for toolkit-views App List on Mac

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/views/chrome_views_delegate.cc

Issue 659233002: STASH: Epic Experimental patch for toolkit-views App List on Mac Base URL: https://chromium.googlesource.com/chromium/src.git/+/master

Patch Set: Fix a few things. Works@master Created 6 years, 2 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/views/chrome_views_delegate.h ('k') | chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/chrome_views_delegate.cc

diff --git a/chrome/browser/ui/views/chrome_views_delegate.cc b/chrome/browser/ui/views/chrome_views_delegate.cc

index 6709570f055a82fd3469ab6e71e0d9acfbfd28bc..57a2bda779afb689f65d9a0536d65d64afbb331f 100644

--- a/chrome/browser/ui/views/chrome_views_delegate.cc

+++ b/chrome/browser/ui/views/chrome_views_delegate.cc

@@ -15,6 +15,7 @@

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

#include "chrome/browser/ui/views/accessibility/accessibility_event_router_views.h"

#include "chrome/common/pref_names.h"

+#include "content/public/browser/context_factory.h"

#include "grit/chrome_unscaled_resources.h"

#include "ui/base/resource/resource_bundle.h"

#include "ui/base/ui_base_switches.h"

@@ -34,7 +35,6 @@

#endif

#if defined(USE_AURA)

-#include "content/public/browser/context_factory.h"

#include "ui/aura/window.h"

#include "ui/aura/window_event_dispatcher.h"

#endif

@@ -57,7 +57,6 @@

#include "chrome/browser/ui/ash/ash_util.h"

#endif

// Helpers --------------------------------------------------------------------

namespace {

@@ -383,11 +382,9 @@ bool ChromeViewsDelegate::WindowManagerProvidesTitleBar(bool maximized) {

}

#endif

-#if defined(USE_AURA)

ui::ContextFactory* ChromeViewsDelegate::GetContextFactory() {

return content::GetContextFactory();

}

-#endif

#if defined(OS_WIN)

int ChromeViewsDelegate::GetAppbarAutohideEdges(HMONITOR monitor,