chrome/browser/ui/views/frame/browser_view.cc - Issue 2148293003: Excluded non-chromeos source files in chromeos build

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/frame/browser_view.cc

Issue 2148293003: Excluded non-chromeos source files in chromeos build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed failed test Created 4 years, 5 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/bookmarks/bookmark_bubble_sign_in_delegate_browsertest.cc ('k') | chrome/browser/ui/views/tab_dialogs_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/frame/browser_view.cc

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

index 34aaf6228c9eefc07659e75e8256e48449d3b825..479acd4585da9c2077013b705edafadf0dc079a9 100644

--- a/chrome/browser/ui/views/frame/browser_view.cc

+++ b/chrome/browser/ui/views/frame/browser_view.cc

@@ -85,7 +85,6 @@

#include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h"

#include "chrome/browser/ui/views/new_back_shortcut_bubble.h"

#include "chrome/browser/ui/views/omnibox/omnibox_view_views.h"

-#include "chrome/browser/ui/views/profiles/profile_chooser_view.h"

#include "chrome/browser/ui/views/profiles/profile_indicator_icon.h"

#include "chrome/browser/ui/views/session_crashed_bubble_view.h"

#include "chrome/browser/ui/views/status_bubble_views.h"

@@ -155,6 +154,10 @@

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

#include "ui/views/window/dialog_delegate.h"

+#if !defined(OS_CHROMEOS)

+#include "chrome/browser/ui/views/profiles/profile_chooser_view.h"

+#endif

#if defined(USE_ASH)

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

#endif