chrome/browser/ui/views/chrome_views_delegate.cc - Issue 1960293003: Remove OS_CHROMEOS from ui/ash code

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 1960293003: Remove OS_CHROMEOS from ui/ash code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

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 f58dbd24cf724c7dad92f512758a1e61b480f3f0..8151a429e938079f893e7c9fb18352bcf9bb1643 100644

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

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

@@ -61,7 +61,6 @@

#include "ash/wm/common/window_state.h"

#include "ash/wm/window_state_aura.h"

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

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

#endif

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

@@ -307,8 +306,7 @@ gfx::ImageSkia* ChromeViewsDelegate::GetDefaultWindowIcon() const {

#if defined(USE_ASH)

views::NonClientFrameView* ChromeViewsDelegate::CreateDefaultNonClientFrameView(

views::Widget* widget) {

- return chrome::IsNativeViewInAsh(widget->GetNativeView()) ?

- ash::Shell::GetInstance()->CreateDefaultNonClientFrameView(widget) : NULL;

+ return ash::Shell::GetInstance()->CreateDefaultNonClientFrameView(widget);

}

#endif