diff options
Diffstat (limited to 'chrome/browser/ui')
4 files changed, 3 insertions, 11 deletions
diff --git a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc index ff66240..a64f211 100644 --- a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc +++ b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc @@ -992,9 +992,9 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindMovesWhenObscuring) { EXPECT_EQ(position.x(), start_position.x()); } -// FindNextInNewTabUsesPrepopulate times-out on Mac, Windows and Aura. +// FindNextInNewTabUsesPrepopulate times-out on Mac and Aura. // See http://crbug.com/43070 -#if defined(OS_MACOSX) || defined(OS_WIN) || defined(USE_AURA) +#if defined(OS_MACOSX) || defined(USE_AURA) #define MAYBE_FindNextInNewTabUsesPrepopulate \ DISABLED_FindNextInNewTabUsesPrepopulate #else diff --git a/chrome/browser/ui/views/frame/browser_frame.cc b/chrome/browser/ui/views/frame/browser_frame.cc index a3143f0..a2db1e9 100644 --- a/chrome/browser/ui/views/frame/browser_frame.cc +++ b/chrome/browser/ui/views/frame/browser_frame.cc @@ -291,11 +291,9 @@ NewAvatarButton* BrowserFrame::GetNewAvatarMenuButton() { return browser_frame_view_->new_avatar_button(); } -#if !defined(OS_WIN) || defined(USE_AURA) bool BrowserFrame::ShouldLeaveOffsetNearTopBorder() { return !IsMaximized(); } -#endif // OS_WIN void BrowserFrame::OnUseCustomChromeFrameChanged() { // Tell the window manager to add or remove system borders. diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc index fc79d1c..2a4a3c6 100644 --- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc +++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc @@ -19,7 +19,7 @@ namespace chrome { BrowserNonClientFrameView* CreateBrowserNonClientFrameView( BrowserFrame* frame, BrowserView* browser_view) { -#if defined(USE_AURA) && defined(OS_WIN) +#if defined(OS_WIN) if (browser_view->browser()-> host_desktop_type() == chrome::HOST_DESKTOP_TYPE_NATIVE) { if (frame->ShouldUseNativeFrame()) diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc index a04dd57..2197dab 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc @@ -576,17 +576,11 @@ gfx::NativeView OmniboxViewViews::GetRelativeWindowForPopup() const { } void OmniboxViewViews::SetGrayTextAutocompletion(const base::string16& input) { -#if defined(OS_WIN) || defined(USE_AURA) location_bar_view_->SetGrayTextAutocompletion(input); -#endif } base::string16 OmniboxViewViews::GetGrayTextAutocompletion() const { -#if defined(OS_WIN) || defined(USE_AURA) return location_bar_view_->GetGrayTextAutocompletion(); -#else - return base::string16(); -#endif } int OmniboxViewViews::GetWidth() const { |