chrome/browser/ui/views/frame/browser_frame.cc - Issue 26054002: fix #include from r226927

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/ui/views/frame/browser_frame.cc

Issue 26054002: fix #include from r226927 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « no previous file | no next file » | no next file with comments »

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 #include "chrome/browser/ui/views/frame/browser_frame.h"	5 #include "chrome/browser/ui/views/frame/browser_frame.h"

6	6

7 #include "ash/shell.h"	7 #include "ash/shell.h"

8 #include "base/command_line.h"	8 #include "base/command_line.h"

9 #include "base/i18n/rtl.h"	9 #include "base/i18n/rtl.h"

10 #include "chrome/browser/app_mode/app_mode_utils.h"	10 #include "chrome/browser/app_mode/app_mode_utils.h"

(...skipping 16 matching lines...) Expand all Loading...
27 #include "ui/aura/window.h"	27 #include "ui/aura/window.h"

28 #include "ui/base/hit_test.h"	28 #include "ui/base/hit_test.h"

29 #include "ui/base/theme_provider.h"	29 #include "ui/base/theme_provider.h"

30 #include "ui/gfx/font.h"	30 #include "ui/gfx/font.h"

31 #include "ui/gfx/screen.h"	31 #include "ui/gfx/screen.h"

32 #include "ui/views/controls/menu/menu_runner.h"	32 #include "ui/views/controls/menu/menu_runner.h"

33 #include "ui/views/widget/native_widget.h"	33 #include "ui/views/widget/native_widget.h"

34	34

35 #if defined(OS_WIN) && !defined(USE_AURA)	35 #if defined(OS_WIN) && !defined(USE_AURA)

36 #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h"	36 #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h"

37 #include "ui/views/widget/native_widget_win.cc"	37 #include "ui/views/widget/native_widget_win.h"

38 #endif	38 #endif

39	39

40 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)	40 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)

41 #include "chrome/browser/shell_integration_linux.h"	41 #include "chrome/browser/shell_integration_linux.h"

42 #endif	42 #endif

43	43

44 #if defined(USE_ASH)	44 #if defined(USE_ASH)

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

46 #endif	46 #endif

47	47

(...skipping 202 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
250	250

251 AvatarMenuButton* BrowserFrame::GetAvatarMenuButton() {	251 AvatarMenuButton* BrowserFrame::GetAvatarMenuButton() {

252 return browser_frame_view_->avatar_button();	252 return browser_frame_view_->avatar_button();

253 }	253 }

254	254

255 #if !defined(OS_WIN) \|\| defined(USE_AURA)	255 #if !defined(OS_WIN) \|\| defined(USE_AURA)

256 bool BrowserFrame::ShouldLeaveOffsetNearTopBorder() {	256 bool BrowserFrame::ShouldLeaveOffsetNearTopBorder() {

257 return !IsMaximized();	257 return !IsMaximized();

258 }	258 }

259 #endif // OS_WIN	259 #endif // OS_WIN

OLD	NEW