diff options
Diffstat (limited to 'chrome')
10 files changed, 9 insertions, 17 deletions
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index f019009..c5967b7 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -1692,7 +1692,7 @@ const Experiment kExperiments[] = { kOsAll, SINGLE_VALUE_TYPE(autofill::switches::kDisableIgnoreAutocompleteOff) }, -#if defined(USE_AURA) || defined(OS_WIN) +#if defined(USE_AURA) { "enable-permissions-bubbles", IDS_FLAGS_ENABLE_PERMISSIONS_BUBBLES_NAME, diff --git a/chrome/browser/autofill/form_structure_browsertest.cc b/chrome/browser/autofill/form_structure_browsertest.cc index cb3abcc..ed186a9 100644 --- a/chrome/browser/autofill/form_structure_browsertest.cc +++ b/chrome/browser/autofill/form_structure_browsertest.cc @@ -104,7 +104,7 @@ std::string FormStructureBrowserTest::FormStructuresToString( // Heuristics tests timeout on Windows. See http://crbug.com/85276 // Also on ChromeOS/Aura. See crbug.com/173621 // On Linux too. See crbug.com/323093 -#if defined(OS_WIN) || defined(USE_AURA) || defined(OS_LINUX) +#if defined(USE_AURA) #define MAYBE_DataDrivenHeuristics(n) DISABLED_DataDrivenHeuristics##n #else #define MAYBE_DataDrivenHeuristics(n) DataDrivenHeuristics##n diff --git a/chrome/browser/download/download_danger_prompt.cc b/chrome/browser/download/download_danger_prompt.cc index 03c410d..4ec23bc 100644 --- a/chrome/browser/download/download_danger_prompt.cc +++ b/chrome/browser/download/download_danger_prompt.cc @@ -230,7 +230,7 @@ void DownloadDangerPromptImpl::RunDone(Action action) { } // namespace -#if !(defined(OS_WIN) || defined(USE_AURA)) +#if !defined(USE_AURA) // static DownloadDangerPrompt* DownloadDangerPrompt::Create( content::DownloadItem* item, diff --git a/chrome/browser/errorpage_browsertest.cc b/chrome/browser/errorpage_browsertest.cc index cc95ab7..d68f99c 100644 --- a/chrome/browser/errorpage_browsertest.cc +++ b/chrome/browser/errorpage_browsertest.cc @@ -281,7 +281,7 @@ void InterceptNetworkTransactions(net::URLRequestContextGetter* getter, } // See crbug.com/109669 -#if defined(USE_AURA) || defined(OS_WIN) +#if defined(USE_AURA) #define MAYBE_DNSError_Basic DISABLED_DNSError_Basic #else #define MAYBE_DNSError_Basic DNSError_Basic diff --git a/chrome/browser/extensions/extension_crash_recovery_browsertest.cc b/chrome/browser/extensions/extension_crash_recovery_browsertest.cc index ccaf59e..0f943bf 100644 --- a/chrome/browser/extensions/extension_crash_recovery_browsertest.cc +++ b/chrome/browser/extensions/extension_crash_recovery_browsertest.cc @@ -510,7 +510,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_ExtensionCrashRecoveryTest, // Fails a DCHECK on Aura and Linux: http://crbug.com/169622 // Failing on Windows: http://crbug.com/232340 -#if defined(USE_AURA) || defined(OS_WIN) || defined(OS_LINUX) +#if defined(USE_AURA) #define MAYBE_ReloadTabsWithBackgroundPage DISABLED_ReloadTabsWithBackgroundPage #else #define MAYBE_ReloadTabsWithBackgroundPage ReloadTabsWithBackgroundPage diff --git a/chrome/browser/themes/theme_service.cc b/chrome/browser/themes/theme_service.cc index 584ed73..c8c25fc 100644 --- a/chrome/browser/themes/theme_service.cc +++ b/chrome/browser/themes/theme_service.cc @@ -482,7 +482,7 @@ void ThemeService::NotifyThemeChanged() { } } -#if defined(OS_WIN) || defined(USE_AURA) +#if defined(USE_AURA) void ThemeService::FreePlatformCaches() { // Views (Skia) has no platform image cache to clear. } 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 { |