diff options
49 files changed, 214 insertions, 383 deletions
diff --git a/ash/accelerators/magnifier_key_scroller.cc b/ash/accelerators/magnifier_key_scroller.cc index c734e84..709336f 100644 --- a/ash/accelerators/magnifier_key_scroller.cc +++ b/ash/accelerators/magnifier_key_scroller.cc @@ -17,13 +17,9 @@ bool magnifier_key_scroller_enabled = false; // static bool MagnifierKeyScroller::IsEnabled() { - bool has_switch = false; -#if defined(OS_CHROMEOS) - has_switch = CommandLine::ForCurrentProcess()->HasSwitch( - switches::kAshEnableMagnifierKeyScroller); -#endif - - return (magnifier_key_scroller_enabled || has_switch) && + return (magnifier_key_scroller_enabled || + CommandLine::ForCurrentProcess()->HasSwitch( + switches::kAshEnableMagnifierKeyScroller)) && ash::Shell::GetInstance()->magnification_controller()->IsEnabled(); } diff --git a/ash/ash.gyp b/ash/ash.gyp index c6007c9..2612243 100644 --- a/ash/ash.gyp +++ b/ash/ash.gyp @@ -1022,7 +1022,7 @@ 'wm/workspace_controller_unittest.cc', ], 'conditions': [ - ['chromeos==0', { + ['OS=="win"', { 'sources/': [ # TODO(zork): fix this test to build on Windows. See: crosbug.com/26906 ['exclude', 'focus_cycler_unittest.cc'], diff --git a/ash/ash_constants.cc b/ash/ash_constants.cc index 8e932a7..d8551d1 100644 --- a/ash/ash_constants.cc +++ b/ash/ash_constants.cc @@ -14,9 +14,7 @@ const int kResizeOutsideBoundsSize = 6; const int kResizeOutsideBoundsScaleForTouch = 5; const int kResizeInsideBoundsSize = 1; -#if defined(OS_CHROMEOS) const SkColor kChromeOsBootColor = SkColorSetRGB(0xfe, 0xfe, 0xfe); -#endif const SkColor kFocusBorderColor = SkColorSetRGB(64, 128, 250); diff --git a/ash/display/display_controller.cc b/ash/display/display_controller.cc index e4d33fb..498aef3 100644 --- a/ash/display/display_controller.cc +++ b/ash/display/display_controller.cc @@ -43,8 +43,6 @@ #include "ash/display/display_configurator_animation.h" #include "base/sys_info.h" #include "base/time/time.h" -#endif // defined(OS_CHROMEOS) - #if defined(USE_X11) #include "ui/base/x/x11_util.h" #include "ui/gfx/x/x11_types.h" @@ -54,7 +52,7 @@ #include <X11/extensions/Xrandr.h> #undef RootWindow #endif // defined(USE_X11) - +#endif // defined(OS_CHROMEOS) namespace ash { namespace { diff --git a/ash/drag_drop/drag_drop_interactive_uitest.cc b/ash/drag_drop/drag_drop_interactive_uitest.cc index 24920fd..ef32801 100644 --- a/ash/drag_drop/drag_drop_interactive_uitest.cc +++ b/ash/drag_drop/drag_drop_interactive_uitest.cc @@ -142,7 +142,7 @@ class DragDropTest : public test::AshTestBase { } }; -#if !defined(OS_CHROMEOS) +#if defined(OS_WIN) #define MAYBE_DragDropAcrossMultiDisplay DISABLED_DragDropAcrossMultiDisplay #else #define MAYBE_DragDropAcrossMultiDisplay DragDropAcrossMultiDisplay diff --git a/ash/host/ash_window_tree_host_x11.cc b/ash/host/ash_window_tree_host_x11.cc index 216dbb1..94ca0cc 100644 --- a/ash/host/ash_window_tree_host_x11.cc +++ b/ash/host/ash_window_tree_host_x11.cc @@ -286,9 +286,7 @@ void AshWindowTreeHostX11::UpdateRootWindowSize(const gfx::Size& host_size) { } void AshWindowTreeHostX11::OnCursorVisibilityChangedNative(bool show) { -#if defined(OS_CHROMEOS) SetCrOSTapPaused(!show); -#endif } void AshWindowTreeHostX11::OnWindowInitialized(aura::Window* window) {} @@ -302,11 +300,9 @@ void AshWindowTreeHostX11::OnHostInitialized(aura::WindowTreeHost* host) { return; UpdateIsInternalDisplay(); -#if defined(OS_CHROMEOS) // We have to enable Tap-to-click by default because the cursor is set to // visible in Shell::InitRootWindowController. SetCrOSTapPaused(false); -#endif } void AshWindowTreeHostX11::OnConfigureNotify() { @@ -327,7 +323,6 @@ void AshWindowTreeHostX11::TranslateAndDispatchLocatedEvent( case ui::ET_TOUCH_PRESSED: case ui::ET_TOUCH_CANCELLED: case ui::ET_TOUCH_RELEASED: { -#if defined(OS_CHROMEOS) ui::TouchEvent* touchev = static_cast<ui::TouchEvent*>(event); if (base::SysInfo::IsRunningOnChromeOS()) { // X maps the touch-surface to the size of the X root-window. @@ -342,7 +337,6 @@ void AshWindowTreeHostX11::TranslateAndDispatchLocatedEvent( touch_calibrate_->Calibrate(touchev, bounds()); #endif // defined(USE_XI2_MT) } -#endif // defined(OS_CHROMEOS) break; } default: { @@ -378,7 +372,6 @@ void AshWindowTreeHostX11::UpdateIsInternalDisplay() { is_internal_display_ = display.IsInternal(); } -#if defined(OS_CHROMEOS) void AshWindowTreeHostX11::SetCrOSTapPaused(bool state) { if (!ui::IsXInput2Available()) return; @@ -421,7 +414,6 @@ void AshWindowTreeHostX11::SetCrOSTapPaused(bool state) { } } } -#endif AshWindowTreeHost* AshWindowTreeHost::Create(const gfx::Rect& initial_bounds) { return new AshWindowTreeHostX11(initial_bounds); diff --git a/ash/host/ash_window_tree_host_x11.h b/ash/host/ash_window_tree_host_x11.h index 47e8bc7..f7939f2 100644 --- a/ash/host/ash_window_tree_host_x11.h +++ b/ash/host/ash_window_tree_host_x11.h @@ -55,11 +55,9 @@ class ASH_EXPORT AshWindowTreeHostX11 : public AshWindowTreeHost, // Update is_internal_display_ based on the current state. void UpdateIsInternalDisplay(); -#if defined(OS_CHROMEOS) // Set the CrOS touchpad "tap paused" property. It is used to temporarily // turn off the Tap-to-click feature when the mouse pointer is invisible. void SetCrOSTapPaused(bool state); -#endif // True if the root host resides on the internal display bool is_internal_display_; diff --git a/ash/host/ash_window_tree_host_x11_unittest.cc b/ash/host/ash_window_tree_host_x11_unittest.cc index e43df42..efd25c0 100644 --- a/ash/host/ash_window_tree_host_x11_unittest.cc +++ b/ash/host/ash_window_tree_host_x11_unittest.cc @@ -56,35 +56,16 @@ class RootWindowEventHandler : public ui::EventHandler { namespace ash { -class AshWindowTreeHostX11Test : public aura::test::AuraTestBase { - public: - virtual void SetUp() OVERRIDE { - aura::test::AuraTestBase::SetUp(); - -#if defined(OS_CHROMEOS) - // Fake a ChromeOS running env. - const char* kLsbRelease = "CHROMEOS_RELEASE_NAME=Chromium OS\n"; - base::SysInfo::SetChromeOSVersionInfoForTest(kLsbRelease, base::Time()); -#endif - } - - virtual void TearDown() OVERRIDE { - aura::test::AuraTestBase::TearDown(); - -#if defined(OS_CHROMEOS) - // Revert the CrOS testing env otherwise the following non-CrOS aura - // tests will fail. - // Fake a ChromeOS running env. - const char* kLsbRelease = ""; - base::SysInfo::SetChromeOSVersionInfoForTest(kLsbRelease, base::Time()); -#endif - } -}; +typedef aura::test::AuraTestBase WindowTreeHostX11Test; // Send X touch events to one WindowTreeHost. The WindowTreeHost's // delegate will get corresponding ui::TouchEvent if the touch events -// are targeting this WindowTreeHost. -TEST_F(AshWindowTreeHostX11Test, DispatchTouchEventToOneRootWindow) { +// are winthin the bound of the WindowTreeHost. +TEST_F(WindowTreeHostX11Test, DispatchTouchEventToOneRootWindow) { + // Fake a ChromeOS running env. + const char* kLsbRelease = "CHROMEOS_RELEASE_NAME=Chromium OS\n"; + base::SysInfo::SetChromeOSVersionInfoForTest(kLsbRelease, base::Time()); + scoped_ptr<AshWindowTreeHostX11> window_tree_host( new AshWindowTreeHostX11(gfx::Rect(0, 0, 2560, 1700))); window_tree_host->InitHost(); @@ -131,12 +112,22 @@ TEST_F(AshWindowTreeHostX11Test, DispatchTouchEventToOneRootWindow) { EXPECT_EQ(gfx::Point(1500, 1600), handler->last_touch_location()); handler.reset(); + + // Revert the CrOS testing env otherwise the following non-CrOS aura + // tests will fail. + // Fake a ChromeOS running env. + kLsbRelease = ""; + base::SysInfo::SetChromeOSVersionInfoForTest(kLsbRelease, base::Time()); } // Send X touch events to two WindowTreeHost. The WindowTreeHost which is // the event target of the X touch events should generate the corresponding // ui::TouchEvent for its delegate. -TEST_F(AshWindowTreeHostX11Test, DispatchTouchEventToTwoRootWindow) { +TEST_F(WindowTreeHostX11Test, DispatchTouchEventToTwoRootWindow) { + // Fake a ChromeOS running env. + const char* kLsbRelease = "CHROMEOS_RELEASE_NAME=Chromium OS\n"; + base::SysInfo::SetChromeOSVersionInfoForTest(kLsbRelease, base::Time()); + scoped_ptr<AshWindowTreeHostX11> window_tree_host1( new AshWindowTreeHostX11(gfx::Rect(0, 0, 2560, 1700))); window_tree_host1->InitHost(); @@ -235,6 +226,12 @@ TEST_F(AshWindowTreeHostX11Test, DispatchTouchEventToTwoRootWindow) { handler1.reset(); handler2.reset(); + + // Revert the CrOS testing env otherwise the following non-CrOS aura + // tests will fail. + // Fake a ChromeOS running env. + kLsbRelease = ""; + base::SysInfo::SetChromeOSVersionInfoForTest(kLsbRelease, base::Time()); } } // namespace aura diff --git a/build/common.gypi b/build/common.gypi index 3f97a65..4000efe 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -87,7 +87,7 @@ 'conditions': [ # ChromeOS and Windows use Aura and Ash. - ['chromeos==1 or OS=="win" or OS=="linux"', { + ['chromeos==1 or OS=="win"', { 'use_ash%': 1, 'use_aura%': 1, }], @@ -97,6 +97,14 @@ 'use_aura%': 1, }], + # ToT Linux should be aura. + # + # TODO(erg): Merge this into the previous block once compiling with + # aura safely implies including ash capabilities. + ['OS=="linux"', { + 'use_aura%': 1, + }], + # Whether we're a traditional desktop unix. ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and chromeos==0', { 'desktop_linux%': 1, diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd index 088f3fca..cb0e1ef 100644 --- a/chrome/app/theme/theme_resources.grd +++ b/chrome/app/theme/theme_resources.grd @@ -164,8 +164,8 @@ </if> <if expr="use_ash"> <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_CENTER" file="common/ash/content_top_center.png" /> - <if expr="not chromeos"> - <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_CENTER_DESKTOP" file="content_top_center.png" /> + <if expr="is_win"> + <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_CENTER_WIN" file="content_top_center.png" /> </if> </if> <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_LEFT_CORNER" file="content_top_left_corner.png" /> @@ -661,8 +661,8 @@ </if> <if expr="use_ash"> <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="common/ash/otr_icon.png" /> - <if expr="not chromeos"> - <structure type="chrome_scaled_image" name="IDR_OTR_ICON_DESKTOP" file="common/otr_icon.png" /> + <if expr="is_win"> + <structure type="chrome_scaled_image" name="IDR_OTR_ICON_WIN" file="common/otr_icon.png" /> </if> </if> </if> @@ -1188,11 +1188,11 @@ <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INACTIVE" file="common/ash/theme_frame_inactive.png" /> <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO" file="common/ash/theme_frame_incognito_active.png" /> <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="common/ash/theme_frame_incognito_inactive.png" /> - <if expr="not chromeos"> - <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_DESKTOP" file="theme_frame.png" /> - <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INACTIVE_DESKTOP" file="theme_frame_inactive.png" /> - <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_DESKTOP" file="theme_frame_incognito.png" /> - <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_INACTIVE_DESKTOP" file="theme_frame_incognito_inactive.png" /> + <if expr="is_win"> + <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_WIN" file="theme_frame.png" /> + <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INACTIVE_WIN" file="theme_frame_inactive.png" /> + <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_WIN" file="theme_frame_incognito.png" /> + <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_INACTIVE_WIN" file="theme_frame_incognito_inactive.png" /> </if> </if> <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_OVERLAY" file="notused.png" /> @@ -1207,9 +1207,9 @@ <!-- Ash has gray tab backgrounds, Windows uses blue. --> <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND" file="common/ash/theme_default_inactive.png" /> <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INCOGNITO" file="common/ash/theme_default_inactive.png" /> - <if expr="not chromeos"> - <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_DESKTOP" file="theme_tab_background.png" /> - <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INCOGNITO_DESKTOP" file="theme_tab_background_incognito.png" /> + <if expr="is_win"> + <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_WIN" file="theme_tab_background.png" /> + <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INCOGNITO_WIN" file="theme_tab_background_incognito.png" /> </if> </if> <if expr="is_macosx or is_ios"> @@ -1223,8 +1223,8 @@ <if expr="use_ash"> <!-- Ash has a dark gray toolbar background, Windows has light gray. --> <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR" file="common/ash/theme_default_active.png" /> - <if expr="not chromeos"> - <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR_DESKTOP" file="theme_toolbar_default.png" /> + <if expr="is_win"> + <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR_WIN" file="theme_toolbar_default.png" /> </if> </if> <if expr="is_macosx or is_ios"> diff --git a/chrome/browser/extensions/window_open_apitest.cc b/chrome/browser/extensions/window_open_apitest.cc index 90bfdae..b50247a 100644 --- a/chrome/browser/extensions/window_open_apitest.cc +++ b/chrome/browser/extensions/window_open_apitest.cc @@ -35,7 +35,7 @@ #include "apps/app_window_registry.h" #endif -#if defined(USE_ASH) && defined(OS_CHROMEOS) +#if defined(USE_ASH) && !defined(OS_WIN) // TODO(stevenjb): Figure out the correct behavior for Ash + Win #define USE_ASH_PANELS #endif @@ -273,16 +273,8 @@ IN_PROC_BROWSER_TEST_F(WindowOpenPanelTest, MAYBE_WindowOpenPanelDetached) { ASSERT_TRUE(RunExtensionTest("window_open/panel_detached")) << message_; } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -// TODO(erg): Bring up ash http://crbug.com/300084 -#define MAYBE_CloseNonExtensionPanelsOnUninstall \ - DISABLED_CloseNonExtensionPanelsOnUninstall -#else -#define MAYBE_CloseNonExtensionPanelsOnUninstall \ - CloseNonExtensionPanelsOnUninstall -#endif IN_PROC_BROWSER_TEST_F(WindowOpenPanelTest, - MAYBE_CloseNonExtensionPanelsOnUninstall) { + CloseNonExtensionPanelsOnUninstall) { #if defined(OS_WIN) && defined(USE_ASH) // Disable this test in Metro+Ash for now (http://crbug.com/262796). if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) @@ -353,8 +345,8 @@ IN_PROC_BROWSER_TEST_F(WindowOpenPanelTest, EXPECT_TRUE(WaitForTabsAndPopups(browser(), 1, num_popups, 0)); } -// This test isn't applicable on Chrome OS, which automatically reloads crashed -// pages. +// This test isn't applicable on Chrome OS, which automatically reloads +// crashed pages. #if !defined(OS_CHROMEOS) IN_PROC_BROWSER_TEST_F(WindowOpenPanelTest, ClosePanelsOnExtensionCrash) { #if defined(USE_ASH_PANELS) diff --git a/chrome/browser/fullscreen_aurax11.cc b/chrome/browser/fullscreen_aurax11.cc index eca8c22..b186c00 100644 --- a/chrome/browser/fullscreen_aurax11.cc +++ b/chrome/browser/fullscreen_aurax11.cc @@ -6,21 +6,11 @@ #include <vector> -#include "ash/root_window_controller.h" -#include "chrome/browser/ui/host_desktop.h" #include "ui/gfx/native_widget_types.h" #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h" #include "ui/views/widget/widget.h" bool IsFullScreenMode() { -#if defined(USE_ASH) - if (chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_ASH) { - ash::RootWindowController* controller = - ash::RootWindowController::ForTargetRootWindow(); - return controller && controller->GetWindowForFullscreenMode(); - } -#endif - std::vector<aura::Window*> all_windows = views::DesktopWindowTreeHostX11::GetAllOpenWindows(); // Only the topmost window is checked. This works fine in the most cases, but diff --git a/chrome/browser/managed_mode/managed_user_theme.cc b/chrome/browser/managed_mode/managed_user_theme.cc index 6431728..f2055a2 100644 --- a/chrome/browser/managed_mode/managed_user_theme.cc +++ b/chrome/browser/managed_mode/managed_user_theme.cc @@ -21,19 +21,19 @@ const SkColor kDefaultColorManagedUserLabelBackground = int MapToManagedUserResourceIds(int id) { switch (id) { case IDR_THEME_FRAME: -#if defined(USE_ASH) && !defined(OS_CHROMEOS) - case IDR_THEME_FRAME_DESKTOP: +#if defined(OS_WIN) + case IDR_THEME_FRAME_WIN: #endif return IDR_MANAGED_USER_THEME_FRAME; case IDR_THEME_FRAME_INACTIVE: -#if defined(USE_ASH) && !defined(OS_CHROMEOS) - case IDR_THEME_FRAME_INACTIVE_DESKTOP: +#if defined(OS_WIN) + case IDR_THEME_FRAME_INACTIVE_WIN: #endif return IDR_MANAGED_USER_THEME_FRAME_INACTIVE; case IDR_THEME_TAB_BACKGROUND: case IDR_THEME_TAB_BACKGROUND_V: -#if defined(USE_ASH) && !defined(OS_CHROMEOS) - case IDR_THEME_TAB_BACKGROUND_DESKTOP: +#if defined(OS_WIN) + case IDR_THEME_TAB_BACKGROUND_WIN: #endif return IDR_MANAGED_USER_THEME_TAB_BACKGROUND; } diff --git a/chrome/browser/notifications/message_center_notification_manager.cc b/chrome/browser/notifications/message_center_notification_manager.cc index 7855ae6..c06040a 100644 --- a/chrome/browser/notifications/message_center_notification_manager.cc +++ b/chrome/browser/notifications/message_center_notification_manager.cc @@ -78,7 +78,7 @@ MessageCenterNotificationManager::MessageCenterNotificationManager( blockers_.push_back(new FullscreenNotificationBlocker(message_center)); #if defined(OS_WIN) || defined(OS_MACOSX) \ - || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + || (defined(USE_AURA) && !defined(USE_ASH)) // On Windows, Linux and Mac, the notification manager owns the tray icon and // views.Other platforms have global ownership and Create will return NULL. tray_.reset(message_center::CreateMessageCenterTray()); diff --git a/chrome/browser/signin/signin_error_notifier_ash_unittest.cc b/chrome/browser/signin/signin_error_notifier_ash_unittest.cc index 7a99568..5f22a9b 100644 --- a/chrome/browser/signin/signin_error_notifier_ash_unittest.cc +++ b/chrome/browser/signin/signin_error_notifier_ash_unittest.cc @@ -80,7 +80,7 @@ class SigninErrorNotifierTest : public AshTestBase { AshTestBase::SetUp(); // Set up screen for Windows. -#if defined(OS_WIN) +#if !defined(OS_CHROMEOS) aura::TestScreen* test_screen = aura::TestScreen::Create(); gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen); gfx::Screen::SetScreenTypeDelegate(new ScreenTypeDelegateDesktop); diff --git a/chrome/browser/themes/browser_theme_pack.cc b/chrome/browser/themes/browser_theme_pack.cc index 6a27182..d209599 100644 --- a/chrome/browser/themes/browser_theme_pack.cc +++ b/chrome/browser/themes/browser_theme_pack.cc @@ -43,7 +43,7 @@ namespace { // Version number of the current theme pack. We just throw out and rebuild // theme packs that aren't int-equal to this. Increment this number if you // change default theme assets. -const int kThemePackVersion = 34; +const int kThemePackVersion = 33; // IDs that are in the DataPack won't clash with the positive integer // uint16. kHeaderID should always have the maximum value because we want the @@ -162,37 +162,37 @@ PersistingImagesTable kPersistingImages[] = { }; const size_t kPersistingImagesLength = arraysize(kPersistingImages); -#if defined(USE_ASH) && !defined(OS_CHROMEOS) +#if defined(OS_WIN) // Persistent theme ids for Windows. -const int PRS_THEME_FRAME_DESKTOP = 100; -const int PRS_THEME_FRAME_INACTIVE_DESKTOP = 101; -const int PRS_THEME_FRAME_INCOGNITO_DESKTOP = 102; -const int PRS_THEME_FRAME_INCOGNITO_INACTIVE_DESKTOP = 103; -const int PRS_THEME_TOOLBAR_DESKTOP = 104; -const int PRS_THEME_TAB_BACKGROUND_DESKTOP = 105; -const int PRS_THEME_TAB_BACKGROUND_INCOGNITO_DESKTOP = 106; +const int PRS_THEME_FRAME_WIN = 100; +const int PRS_THEME_FRAME_INACTIVE_WIN = 101; +const int PRS_THEME_FRAME_INCOGNITO_WIN = 102; +const int PRS_THEME_FRAME_INCOGNITO_INACTIVE_WIN = 103; +const int PRS_THEME_TOOLBAR_WIN = 104; +const int PRS_THEME_TAB_BACKGROUND_WIN = 105; +const int PRS_THEME_TAB_BACKGROUND_INCOGNITO_WIN = 106; // Persistent theme to resource id mapping for Windows AURA. -PersistingImagesTable kPersistingImagesDesktopAura[] = { - { PRS_THEME_FRAME_DESKTOP, IDR_THEME_FRAME_DESKTOP, +PersistingImagesTable kPersistingImagesWinDesktopAura[] = { + { PRS_THEME_FRAME_WIN, IDR_THEME_FRAME_WIN, "theme_frame" }, - { PRS_THEME_FRAME_INACTIVE_DESKTOP, IDR_THEME_FRAME_INACTIVE_DESKTOP, + { PRS_THEME_FRAME_INACTIVE_WIN, IDR_THEME_FRAME_INACTIVE_WIN, "theme_frame_inactive" }, - { PRS_THEME_FRAME_INCOGNITO_DESKTOP, IDR_THEME_FRAME_INCOGNITO_DESKTOP, + { PRS_THEME_FRAME_INCOGNITO_WIN, IDR_THEME_FRAME_INCOGNITO_WIN, "theme_frame_incognito" }, - { PRS_THEME_FRAME_INCOGNITO_INACTIVE_DESKTOP, - IDR_THEME_FRAME_INCOGNITO_INACTIVE_DESKTOP, + { PRS_THEME_FRAME_INCOGNITO_INACTIVE_WIN, + IDR_THEME_FRAME_INCOGNITO_INACTIVE_WIN, "theme_frame_incognito_inactive" }, - { PRS_THEME_TOOLBAR_DESKTOP, IDR_THEME_TOOLBAR_DESKTOP, + { PRS_THEME_TOOLBAR_WIN, IDR_THEME_TOOLBAR_WIN, "theme_toolbar" }, - { PRS_THEME_TAB_BACKGROUND_DESKTOP, IDR_THEME_TAB_BACKGROUND_DESKTOP, + { PRS_THEME_TAB_BACKGROUND_WIN, IDR_THEME_TAB_BACKGROUND_WIN, "theme_tab_background" }, - { PRS_THEME_TAB_BACKGROUND_INCOGNITO_DESKTOP, - IDR_THEME_TAB_BACKGROUND_INCOGNITO_DESKTOP, + { PRS_THEME_TAB_BACKGROUND_INCOGNITO_WIN, + IDR_THEME_TAB_BACKGROUND_INCOGNITO_WIN, "theme_tab_background_incognito" }, }; -const size_t kPersistingImagesDesktopAuraLength = - arraysize(kPersistingImagesDesktopAura); +const size_t kPersistingImagesWinDesktopAuraLength = + arraysize(kPersistingImagesWinDesktopAura); #endif int GetPersistentIDByNameHelper(const std::string& key, @@ -221,10 +221,10 @@ int GetPersistentIDByIDR(int idr) { int prs_id = kPersistingImages[i].persistent_id; (*lookup_table)[idr] = prs_id; } -#if defined(USE_ASH) && !defined(OS_CHROMEOS) - for (size_t i = 0; i < kPersistingImagesDesktopAuraLength; ++i) { - int idr = kPersistingImagesDesktopAura[i].idr_id; - int prs_id = kPersistingImagesDesktopAura[i].persistent_id; +#if defined(OS_WIN) + for (size_t i = 0; i < kPersistingImagesWinDesktopAuraLength; ++i) { + int idr = kPersistingImagesWinDesktopAura[i].idr_id; + int prs_id = kPersistingImagesWinDesktopAura[i].persistent_id; (*lookup_table)[idr] = prs_id; } #endif @@ -341,11 +341,11 @@ IntToIntTable kFrameTintMap[] = { { PRS_THEME_FRAME_INCOGNITO, ThemeProperties::TINT_FRAME_INCOGNITO }, { PRS_THEME_FRAME_INCOGNITO_INACTIVE, ThemeProperties::TINT_FRAME_INCOGNITO_INACTIVE }, -#if defined(USE_ASH) && !defined(OS_CHROMEOS) - { PRS_THEME_FRAME_DESKTOP, ThemeProperties::TINT_FRAME }, - { PRS_THEME_FRAME_INACTIVE_DESKTOP, ThemeProperties::TINT_FRAME_INACTIVE }, - { PRS_THEME_FRAME_INCOGNITO_DESKTOP, ThemeProperties::TINT_FRAME_INCOGNITO }, - { PRS_THEME_FRAME_INCOGNITO_INACTIVE_DESKTOP, +#if defined(OS_WIN) + { PRS_THEME_FRAME_WIN, ThemeProperties::TINT_FRAME }, + { PRS_THEME_FRAME_INACTIVE_WIN, ThemeProperties::TINT_FRAME_INACTIVE }, + { PRS_THEME_FRAME_INCOGNITO_WIN, ThemeProperties::TINT_FRAME_INCOGNITO }, + { PRS_THEME_FRAME_INCOGNITO_INACTIVE_WIN, ThemeProperties::TINT_FRAME_INCOGNITO_INACTIVE }, #endif }; @@ -355,10 +355,9 @@ IntToIntTable kFrameTintMap[] = { IntToIntTable kTabBackgroundMap[] = { { PRS_THEME_TAB_BACKGROUND, PRS_THEME_FRAME }, { PRS_THEME_TAB_BACKGROUND_INCOGNITO, PRS_THEME_FRAME_INCOGNITO }, -#if defined(USE_ASH) && !defined(OS_CHROMEOS) - { PRS_THEME_TAB_BACKGROUND_DESKTOP, PRS_THEME_FRAME_DESKTOP }, - { PRS_THEME_TAB_BACKGROUND_INCOGNITO_DESKTOP, - PRS_THEME_FRAME_INCOGNITO_DESKTOP }, +#if defined(OS_WIN) + { PRS_THEME_TAB_BACKGROUND_WIN, PRS_THEME_FRAME_WIN }, + { PRS_THEME_TAB_BACKGROUND_INCOGNITO_WIN, PRS_THEME_FRAME_INCOGNITO_WIN }, #endif }; @@ -390,8 +389,8 @@ struct CropEntry kImagesToCrop[] = { { PRS_THEME_TOOLBAR, 200, false }, { PRS_THEME_BUTTON_BACKGROUND, 60, false }, { PRS_THEME_WINDOW_CONTROL_BACKGROUND, 50, false }, -#if defined(USE_ASH) && !defined(OS_CHROMEOS) - { PRS_THEME_TOOLBAR_DESKTOP, 200, false } +#if defined(OS_WIN) + { PRS_THEME_TOOLBAR_WIN, 200, false } #endif }; @@ -769,9 +768,9 @@ void BrowserThemePack::GetThemeableImageIDRs(std::set<int>* result) { for (size_t i = 0; i < kPersistingImagesLength; ++i) result->insert(kPersistingImages[i].idr_id); -#if defined(USE_ASH) && !defined(OS_CHROMEOS) - for (size_t i = 0; i < kPersistingImagesDesktopAuraLength; ++i) - result->insert(kPersistingImagesDesktopAura[i].idr_id); +#if defined(OS_WIN) + for (size_t i = 0; i < kPersistingImagesWinDesktopAuraLength; ++i) + result->insert(kPersistingImagesWinDesktopAura[i].idr_id); #endif } @@ -1209,10 +1208,10 @@ void BrowserThemePack::AddFileAtScaleToMap(const std::string& image_name, int id = GetPersistentIDByName(image_name); if (id != -1) (*file_paths)[id][scale_factor] = image_path; -#if defined(USE_ASH) && !defined(OS_CHROMEOS) +#if defined(OS_WIN) id = GetPersistentIDByNameHelper(image_name, - kPersistingImagesDesktopAura, - kPersistingImagesDesktopAuraLength); + kPersistingImagesWinDesktopAura, + kPersistingImagesWinDesktopAuraLength); if (id != -1) (*file_paths)[id][scale_factor] = image_path; #endif @@ -1337,15 +1336,15 @@ void BrowserThemePack::CreateFrameImages(ImageCache* images) const { // thing and just use the default images. int prs_base_id = 0; -#if defined(USE_ASH) && !defined(OS_CHROMEOS) - if (prs_id == PRS_THEME_FRAME_INCOGNITO_INACTIVE_DESKTOP) { - prs_base_id = images->count(PRS_THEME_FRAME_INCOGNITO_DESKTOP) ? - PRS_THEME_FRAME_INCOGNITO_DESKTOP : PRS_THEME_FRAME_DESKTOP; - } else if (prs_id == PRS_THEME_FRAME_INACTIVE_DESKTOP) { - prs_base_id = PRS_THEME_FRAME_DESKTOP; - } else if (prs_id == PRS_THEME_FRAME_INCOGNITO_DESKTOP && - !images->count(PRS_THEME_FRAME_INCOGNITO_DESKTOP)) { - prs_base_id = PRS_THEME_FRAME_DESKTOP; +#if defined(OS_WIN) + if (prs_id == PRS_THEME_FRAME_INCOGNITO_INACTIVE_WIN) { + prs_base_id = images->count(PRS_THEME_FRAME_INCOGNITO_WIN) ? + PRS_THEME_FRAME_INCOGNITO_WIN : PRS_THEME_FRAME_WIN; + } else if (prs_id == PRS_THEME_FRAME_INACTIVE_WIN) { + prs_base_id = PRS_THEME_FRAME_WIN; + } else if (prs_id == PRS_THEME_FRAME_INCOGNITO_WIN && + !images->count(PRS_THEME_FRAME_INCOGNITO_WIN)) { + prs_base_id = PRS_THEME_FRAME_WIN; } #endif if (!prs_base_id) { @@ -1368,8 +1367,8 @@ void BrowserThemePack::CreateFrameImages(ImageCache* images) const { } else if (prs_base_id != prs_id && images->count(prs_base_id)) { frame = (*images)[prs_base_id]; } else if (prs_base_id == PRS_THEME_FRAME_OVERLAY) { -#if defined(USE_ASH) && !defined(OS_CHROMEOS) - if (images->count(PRS_THEME_FRAME_DESKTOP)) { +#if defined(OS_WIN) + if (images->count(PRS_THEME_FRAME_WIN)) { #else if (images->count(PRS_THEME_FRAME)) { #endif @@ -1382,10 +1381,10 @@ void BrowserThemePack::CreateFrameImages(ImageCache* images) const { // If the theme doesn't specify an image, then apply the tint to // the default frame. frame = rb.GetImageNamed(IDR_THEME_FRAME); -#if defined(USE_ASH) && !defined(OS_CHROMEOS) - if (prs_id >= PRS_THEME_FRAME_DESKTOP && - prs_id <= PRS_THEME_FRAME_INCOGNITO_INACTIVE_DESKTOP) { - frame = rb.GetImageNamed(IDR_THEME_FRAME_DESKTOP); +#if defined(OS_WIN) && defined(USE_AURA) + if (prs_id >= PRS_THEME_FRAME_WIN && + prs_id <= PRS_THEME_FRAME_INCOGNITO_INACTIVE_WIN) { + frame = rb.GetImageNamed(IDR_THEME_FRAME_WIN); } #endif } diff --git a/chrome/browser/themes/browser_theme_pack_unittest.cc b/chrome/browser/themes/browser_theme_pack_unittest.cc index 6db628c..18e3dc7 100644 --- a/chrome/browser/themes/browser_theme_pack_unittest.cc +++ b/chrome/browser/themes/browser_theme_pack_unittest.cc @@ -469,9 +469,9 @@ TEST_F(BrowserThemePackTest, CanParsePaths) { ParseImageNamesJSON(path_json, &out_file_paths); size_t expected_file_paths = 2u; -#if defined(USE_ASH) && !defined(OS_CHROMEOS) - // On desktop builds with ash, additional theme paths are generated to map to - // the special resource ids like IDR_THEME_FRAME_DESKTOP, etc +#if defined(OS_WIN) + // On Windows additional theme paths are generated to map to the special + // resource ids like IDR_THEME_FRAME_WIN, etc expected_file_paths = 3u; #endif EXPECT_EQ(expected_file_paths, out_file_paths.size()); diff --git a/chrome/browser/ui/ash/app_list/app_list_service_ash.cc b/chrome/browser/ui/ash/app_list/app_list_service_ash.cc index 58eb99b..ac1dc4f 100644 --- a/chrome/browser/ui/ash/app_list/app_list_service_ash.cc +++ b/chrome/browser/ui/ash/app_list/app_list_service_ash.cc @@ -65,9 +65,8 @@ AppListControllerDelegate* AppListServiceAsh::GetControllerDelegate() { return controller_delegate_.get(); } -// Windows and Linux Ash additionally supports a native UI. See -// app_list_service_{win,linux}.cc. -#if defined(OS_CHROMEOS) +// Windows Ash additionally supports a native UI. See app_list_service_win.cc. +#if !defined(OS_WIN) // static AppListService* AppListService::Get(chrome::HostDesktopType desktop_type) { diff --git a/chrome/browser/ui/ash/chrome_shell_delegate_views.cc b/chrome/browser/ui/ash/chrome_shell_delegate_views.cc index 3061692..3522aa5 100644 --- a/chrome/browser/ui/ash/chrome_shell_delegate_views.cc +++ b/chrome/browser/ui/ash/chrome_shell_delegate_views.cc @@ -22,7 +22,6 @@ #include "chrome/browser/sync/sync_error_notifier_factory_ash.h" #include "chrome/browser/ui/ash/chrome_new_window_delegate.h" #include "chrome/browser/ui/ash/session_state_delegate_views.h" -#include "chrome/browser/ui/ash/solid_color_user_wallpaper_delegate.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_list.h" @@ -36,6 +35,7 @@ #if defined(OS_WIN) #include "chrome/browser/ui/ash/system_tray_delegate_win.h" +#include "chrome/browser/ui/ash/user_wallpaper_delegate_win.h" #endif namespace { @@ -149,7 +149,7 @@ class EmptyAccessibilityDelegate : public ash::AccessibilityDelegate { return ash::A11Y_ALERT_NONE; } - virtual base::TimeDelta PlayShutdownSound() const OVERRIDE { + base::TimeDelta PlayShutdownSound() const OVERRIDE { return base::TimeDelta(); } @@ -194,7 +194,11 @@ ash::AccessibilityDelegate* ChromeShellDelegate::CreateAccessibilityDelegate() { } ash::UserWallpaperDelegate* ChromeShellDelegate::CreateUserWallpaperDelegate() { - return CreateSolidColorUserWallpaperDelegate(); +#if defined(OS_WIN) + return ::CreateUserWallpaperDelegate(); +#else + return NULL; +#endif } void ChromeShellDelegate::Observe(int type, diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc index 354ce1a..9f073ac 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc @@ -650,10 +650,8 @@ void ChromeLauncherController::LaunchApp(const std::string& app_id, return; } -#if defined(OS_WIN) if (LaunchedInNativeDesktop(app_id)) return; -#endif // The app will be created for the currently active profile. AppLaunchParams params(profile_, diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc index 7a51259..887cf81 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc @@ -79,13 +79,11 @@ const char* offline_gmail_url = "https://mail.google.com/mail/mu/u"; const char* gmail_url = "https://mail.google.com/mail/u"; const char* kGmailLaunchURL = "https://mail.google.com/mail/ca"; -#if defined(OS_CHROMEOS) // As defined in /chromeos/dbus/cryptohome_client.cc. const char kUserIdHashSuffix[] = "-hash"; // An extension prefix. const char kCrxAppPrefix[] = "_crx_"; -#endif // ShelfModelObserver implementation that tracks what messages are invoked. class TestShelfModelObserver : public ash::ShelfModelObserver { diff --git a/chrome/browser/ui/ash/screenshot_taker.cc b/chrome/browser/ui/ash/screenshot_taker.cc index 1864112..a94acdf 100644 --- a/chrome/browser/ui/ash/screenshot_taker.cc +++ b/chrome/browser/ui/ash/screenshot_taker.cc @@ -58,9 +58,7 @@ const int kScreenshotMinimumIntervalInMS = 1000; const char kNotificationId[] = "screenshot"; -#if defined(OS_CHROMEOS) const char kNotificationOriginUrl[] = "chrome://screenshot"; -#endif const char kImageClipboardFormatPrefix[] = "<img src='data:image/png;base64,"; const char kImageClipboardFormatSuffix[] = "'>"; @@ -361,7 +359,6 @@ bool GetScreenshotDirectory(base::FilePath* directory) { return true; } -#if defined(OS_CHROMEOS) const int GetScreenshotNotificationTitle( ScreenshotTakerObserver::Result screenshot_result) { switch (screenshot_result) { @@ -385,7 +382,6 @@ const int GetScreenshotNotificationText( return IDS_ASH_SCREENSHOT_NOTIFICATION_TEXT_FAIL; } } -#endif } // namespace diff --git a/chrome/browser/ui/ash/session_state_delegate_views.cc b/chrome/browser/ui/ash/session_state_delegate_views.cc index 675a9bf..2be4389 100644 --- a/chrome/browser/ui/ash/session_state_delegate_views.cc +++ b/chrome/browser/ui/ash/session_state_delegate_views.cc @@ -108,7 +108,7 @@ ash::SessionStateDelegate::SessionState SessionStateDelegate::GetSessionState() const ash::UserInfo* SessionStateDelegate::GetUserInfo( ash::MultiProfileIndex index) const { - return GetUserInfo(static_cast<content::BrowserContext*>(NULL)); + return GetUserInfo(NULL); } const ash::UserInfo* SessionStateDelegate::GetUserInfo( diff --git a/chrome/browser/ui/ash/session_state_delegate_views.h b/chrome/browser/ui/ash/session_state_delegate_views.h index 3b32b29..717fa61 100644 --- a/chrome/browser/ui/ash/session_state_delegate_views.h +++ b/chrome/browser/ui/ash/session_state_delegate_views.h @@ -9,7 +9,6 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/observer_list.h" -#include "ui/gfx/image/image_skia.h" namespace ash { class SessionStateObserver; @@ -46,7 +45,6 @@ class SessionStateDelegate : public ash::SessionStateDelegate { ash::SessionStateObserver* observer) OVERRIDE; virtual void RemoveSessionStateObserver( ash::SessionStateObserver* observer) OVERRIDE; - private: DISALLOW_COPY_AND_ASSIGN(SessionStateDelegate); }; diff --git a/chrome/browser/ui/ash/solid_color_user_wallpaper_delegate.h b/chrome/browser/ui/ash/solid_color_user_wallpaper_delegate.h deleted file mode 100644 index 2634c2c..0000000 --- a/chrome/browser/ui/ash/solid_color_user_wallpaper_delegate.h +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_UI_ASH_SOLID_COLOR_USER_WALLPAPER_DELEGATE_H_ -#define CHROME_BROWSER_UI_ASH_SOLID_COLOR_USER_WALLPAPER_DELEGATE_H_ - -namespace ash { -class UserWallpaperDelegate; -} - -ash::UserWallpaperDelegate* CreateSolidColorUserWallpaperDelegate(); - -#endif // CHROME_BROWSER_UI_ASH_SOLID_COLOR_USER_WALLPAPER_DELEGATE_H_ diff --git a/chrome/browser/ui/ash/solid_color_user_wallpaper_delegate.cc b/chrome/browser/ui/ash/user_wallpaper_delegate_win.cc index f45a90a..92ce758 100644 --- a/chrome/browser/ui/ash/solid_color_user_wallpaper_delegate.cc +++ b/chrome/browser/ui/ash/user_wallpaper_delegate_win.cc @@ -2,10 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/ash/solid_color_user_wallpaper_delegate.h" +#include "ash/desktop_background/user_wallpaper_delegate.h" #include "ash/desktop_background/desktop_background_controller.h" -#include "ash/desktop_background/user_wallpaper_delegate.h" #include "ash/shell.h" #include "ash/wm/window_animations.h" #include "base/basictypes.h" @@ -87,6 +86,6 @@ class UserWallpaperDelegate : public ash::UserWallpaperDelegate { } // namespace -ash::UserWallpaperDelegate* CreateSolidColorUserWallpaperDelegate() { +ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() { return new UserWallpaperDelegate(); } diff --git a/chrome/browser/ui/ash/user_wallpaper_delegate_win.h b/chrome/browser/ui/ash/user_wallpaper_delegate_win.h new file mode 100644 index 0000000..f83f95e --- /dev/null +++ b/chrome/browser/ui/ash/user_wallpaper_delegate_win.h @@ -0,0 +1,14 @@ +// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CHROME_BROWSER_UI_ASH_USER_WALLPAPER_DELEGATE_WIN_H_ +#define CHROME_BROWSER_UI_ASH_USER_WALLPAPER_DELEGATE_WIN_H_ + +namespace ash { +class UserWallpaperDelegate; +} + +ash::UserWallpaperDelegate* CreateUserWallpaperDelegate(); + +#endif // CHROME_BROWSER_UI_ASH_USER_WALLPAPER_DELEGATE_WIN_H_ diff --git a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc index 259b073..3658a52 100644 --- a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc +++ b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc @@ -24,7 +24,6 @@ #include "chrome/browser/ui/libgtk2ui/gtk2_ui.h" #include "chrome/common/pref_names.h" #include "ui/aura/window.h" -#include "ui/base/ime/input_method_initializer.h" #include "ui/native_theme/native_theme_aura.h" #include "ui/views/linux_ui/linux_ui.h" #endif @@ -71,12 +70,7 @@ chrome::HostDesktopType GetInitialDesktop() { command_line->HasSwitch(switches::kViewerLaunchViaAppId)) { return chrome::HOST_DESKTOP_TYPE_ASH; } -#elif defined(OS_LINUX) - const CommandLine* command_line = CommandLine::ForCurrentProcess(); - if (command_line->HasSwitch(switches::kOpenAsh)) - return chrome::HOST_DESKTOP_TYPE_ASH; #endif - return chrome::HOST_DESKTOP_TYPE_NATIVE; } #endif // !defined(OS_CHROMEOS) && defined(USE_ASH) @@ -91,16 +85,10 @@ ChromeBrowserMainExtraPartsAura::~ChromeBrowserMainExtraPartsAura() { void ChromeBrowserMainExtraPartsAura::PreEarlyInitialization() { #if defined(USE_X11) && !defined(OS_CHROMEOS) - if (GetInitialDesktop() != chrome::HOST_DESKTOP_TYPE_ASH) { - // TODO(erg): Refactor this into a dlopen call when we add a GTK3 port. - views::LinuxUI* gtk2_ui = BuildGtk2UI(); - gtk2_ui->SetNativeThemeOverride(base::Bind(&GetNativeThemeForWindow)); - views::LinuxUI::SetInstance(gtk2_ui); - } else { - // TODO(erg): Eventually, we'll need to somehow support IMEs in ash on - // Linux. - ui::InitializeInputMethodForTesting(); - } + // TODO(erg): Refactor this into a dlopen call when we add a GTK3 port. + views::LinuxUI* gtk2_ui = BuildGtk2UI(); + gtk2_ui->SetNativeThemeOverride(base::Bind(&GetNativeThemeForWindow)); + views::LinuxUI::SetInstance(gtk2_ui); #endif } @@ -113,8 +101,7 @@ void ChromeBrowserMainExtraPartsAura::ToolkitInitialized() { #endif #if defined(USE_X11) && !defined(OS_CHROMEOS) - if (GetInitialDesktop() != chrome::HOST_DESKTOP_TYPE_ASH) - views::LinuxUI::instance()->Initialize(); + views::LinuxUI::instance()->Initialize(); #endif } diff --git a/chrome/browser/ui/libgtk2ui/gtk2_ui.cc b/chrome/browser/ui/libgtk2ui/gtk2_ui.cc index 401f3e2..2730216 100644 --- a/chrome/browser/ui/libgtk2ui/gtk2_ui.cc +++ b/chrome/browser/ui/libgtk2ui/gtk2_ui.cc @@ -120,17 +120,10 @@ const color_utils::HSL kDefaultTintFrameIncognitoInactive = { -1, 0.3f, 0.6f }; const color_utils::HSL kDefaultTintBackgroundTab = { -1, 0.5, 0.75 }; // A list of images that we provide while in gtk mode. -// -// TODO(erg): We list both the normal and *_DESKTOP versions of some of these -// images because in some contexts, we don't go through the -// chrome::MapThemeImage interface. That should be fixed, but tracking that -// down is Hard. const int kThemeImages[] = { IDR_THEME_TOOLBAR, IDR_THEME_TAB_BACKGROUND, - IDR_THEME_TAB_BACKGROUND_DESKTOP, IDR_THEME_TAB_BACKGROUND_INCOGNITO, - IDR_THEME_TAB_BACKGROUND_INCOGNITO_DESKTOP, IDR_FRAME, IDR_FRAME_INACTIVE, IDR_THEME_FRAME, @@ -1047,10 +1040,8 @@ SkBitmap Gtk2UI::GenerateGtkThemeBitmap(int id) const { return bitmap; } case IDR_THEME_TAB_BACKGROUND: - case IDR_THEME_TAB_BACKGROUND_DESKTOP: return GenerateTabImage(IDR_THEME_FRAME); case IDR_THEME_TAB_BACKGROUND_INCOGNITO: - case IDR_THEME_TAB_BACKGROUND_INCOGNITO_DESKTOP: return GenerateTabImage(IDR_THEME_FRAME_INCOGNITO); case IDR_FRAME: case IDR_THEME_FRAME: diff --git a/chrome/browser/ui/startup/startup_browser_creator.cc b/chrome/browser/ui/startup/startup_browser_creator.cc index c7a1209..74d9db6 100644 --- a/chrome/browser/ui/startup/startup_browser_creator.cc +++ b/chrome/browser/ui/startup/startup_browser_creator.cc @@ -299,7 +299,7 @@ bool StartupBrowserCreator::LaunchBrowser( chrome::HostDesktopType host_desktop_type = chrome::HOST_DESKTOP_TYPE_NATIVE; -#if defined(USE_ASH) && !defined(OS_CHROMEOS) +#if defined(OS_WIN) && defined(USE_ASH) // We want to maintain only one type of instance for now, either ASH // or desktop. // TODO(shrikant): Remove this code once we decide on running both desktop diff --git a/chrome/browser/ui/views/accelerator_table_unittest.cc b/chrome/browser/ui/views/accelerator_table_unittest.cc index d920d62..3984a38 100644 --- a/chrome/browser/ui/views/accelerator_table_unittest.cc +++ b/chrome/browser/ui/views/accelerator_table_unittest.cc @@ -43,7 +43,7 @@ TEST(AcceleratorTableTest, CheckDuplicatedAccelerators) { } } -#if defined(OS_CHROMEOS) +#if defined(USE_ASH) && !defined(OS_WIN) TEST(AcceleratorTableTest, CheckDuplicatedAcceleratorsAsh) { std::set<AcceleratorMapping, Cmp> acclerators; const std::vector<AcceleratorMapping> accelerator_list(GetAcceleratorList()); diff --git a/chrome/browser/ui/views/app_list/linux/app_list_linux.cc b/chrome/browser/ui/views/app_list/linux/app_list_linux.cc index 936d26d..e513121 100644 --- a/chrome/browser/ui/views/app_list/linux/app_list_linux.cc +++ b/chrome/browser/ui/views/app_list/linux/app_list_linux.cc @@ -90,8 +90,6 @@ void AppListLinux::MoveNearCursor(app_list::AppListView* view) { view->SetBubbleArrow(views::BubbleBorder::FLOAT); - AppListPositioner::ScreenEdge edge; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) // In the Unity desktop environment, special case SCREEN_EDGE_LEFT. It is // always on the left side in Unity, but ShelfLocationInDisplay will not // detect this if the shelf is hidden. @@ -99,10 +97,10 @@ void AppListLinux::MoveNearCursor(app_list::AppListView* view) { // applies, but we currently have no way to detect whether Gnome Shell is // running. views::LinuxUI* ui = views::LinuxUI::instance(); + AppListPositioner::ScreenEdge edge; if (ui && ui->UnityIsRunning()) edge = AppListPositioner::SCREEN_EDGE_LEFT; else -#endif edge = ShelfLocationInDisplay(display); view->SetAnchorPoint(FindAnchorPoint(view->GetPreferredSize(), display, diff --git a/chrome/browser/ui/views/app_list/linux/app_list_service_linux.cc b/chrome/browser/ui/views/app_list/linux/app_list_service_linux.cc index e6df273..c4e45f0 100644 --- a/chrome/browser/ui/views/app_list/linux/app_list_service_linux.cc +++ b/chrome/browser/ui/views/app_list/linux/app_list_service_linux.cc @@ -8,12 +8,8 @@ #include "base/thread_task_runner_handle.h" #include "chrome/browser/shell_integration.h" #include "chrome/browser/shell_integration_linux.h" -#include "chrome/browser/ui/app_list/app_list_controller_delegate.h" #include "chrome/browser/ui/app_list/app_list_controller_delegate_views.h" #include "chrome/browser/ui/app_list/app_list_shower_views.h" -#include "chrome/browser/ui/app_list/app_list_view_delegate.h" -#include "chrome/browser/ui/app_list/scoped_keep_alive.h" -#include "chrome/browser/ui/ash/app_list/app_list_service_ash.h" #include "chrome/browser/ui/views/app_list/linux/app_list_linux.h" #include "content/public/browser/browser_thread.h" #include "grit/chromium_strings.h" @@ -84,14 +80,10 @@ void AppListServiceLinux::MoveNearCursor(app_list::AppListView* view) { // static AppListService* AppListService::Get(chrome::HostDesktopType desktop_type) { - if (desktop_type == chrome::HOST_DESKTOP_TYPE_ASH) - return AppListServiceAsh::GetInstance(); - return AppListServiceLinux::GetInstance(); } // static void AppListService::InitAll(Profile* initial_profile) { - AppListServiceAsh::GetInstance()->Init(initial_profile); AppListServiceLinux::GetInstance()->Init(initial_profile); } diff --git a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc index 6de8b94..6b858b7 100644 --- a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc +++ b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc @@ -68,11 +68,6 @@ ChromeBrowserMainExtraPartsAsh::~ChromeBrowserMainExtraPartsAsh() { void ChromeBrowserMainExtraPartsAsh::PreProfileInit() { if (chrome::ShouldOpenAshOnStartup()) { chrome::OpenAsh(); - -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) - ash::Shell::GetInstance()->CreateShelf(); - ash::Shell::GetInstance()->ShowShelf(); -#endif } else { #if !defined(OS_CHROMEOS) gfx::Screen::SetScreenTypeDelegate(new ScreenTypeDelegateWin); diff --git a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.cc b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.cc index f639312..e21dc4f 100644 --- a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.cc +++ b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.cc @@ -58,6 +58,7 @@ class DesktopThemeProvider : public ui::ThemeProvider { virtual bool HasCustomImage(int id) const OVERRIDE { return delegate_->HasCustomImage( chrome::MapThemeImage(chrome::HOST_DESKTOP_TYPE_NATIVE, id)); + } virtual base::RefCountedMemory* GetRawData( int id, diff --git a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc index 4641c83..49f9ae2 100644 --- a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc +++ b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc @@ -4,78 +4,16 @@ #include "chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.h" -#include "chrome/browser/themes/theme_service.h" -#include "chrome/browser/themes/theme_service_factory.h" -#include "chrome/browser/ui/views/frame/browser_frame.h" -#include "chrome/browser/ui/views/frame/browser_view.h" -#include "chrome/browser/ui/views/theme_image_mapper.h" - -namespace { - -// DesktopThemeProvider maps resource ids using MapThemeImage(). This is -// necessary for BrowserDesktopWindowTreeHostWin so that it uses the windows -// theme images rather than the ash theme images. -// -// This differs from the version in browser_desktop_window_tree_host_win.cc -// because we need to also look up whether we're using the native theme. -class DesktopThemeProvider : public ui::ThemeProvider { - public: - explicit DesktopThemeProvider(ThemeService* delegate) - : delegate_(delegate) { - } - - virtual bool UsingSystemTheme() const OVERRIDE { - return delegate_->UsingSystemTheme(); - } - virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const OVERRIDE { - if (delegate_->UsingSystemTheme()) - return delegate_->GetImageSkiaNamed(id); - - return delegate_->GetImageSkiaNamed( - chrome::MapThemeImage(chrome::HOST_DESKTOP_TYPE_NATIVE, id)); - } - virtual SkColor GetColor(int id) const OVERRIDE { - return delegate_->GetColor(id); - } - virtual int GetDisplayProperty(int id) const OVERRIDE { - return delegate_->GetDisplayProperty(id); - } - virtual bool ShouldUseNativeFrame() const OVERRIDE { - return delegate_->ShouldUseNativeFrame(); - } - virtual bool HasCustomImage(int id) const OVERRIDE { - return delegate_->HasCustomImage( - chrome::MapThemeImage(chrome::HOST_DESKTOP_TYPE_NATIVE, id)); - } - virtual base::RefCountedMemory* GetRawData( - int id, - ui::ScaleFactor scale_factor) const OVERRIDE { - return delegate_->GetRawData(id, scale_factor); - } - - private: - ThemeService* delegate_; - - DISALLOW_COPY_AND_ASSIGN(DesktopThemeProvider); -}; - -} // namespace - //////////////////////////////////////////////////////////////////////////////// // BrowserDesktopWindowTreeHostX11, public: BrowserDesktopWindowTreeHostX11::BrowserDesktopWindowTreeHostX11( views::internal::NativeWidgetDelegate* native_widget_delegate, views::DesktopNativeWidgetAura* desktop_native_widget_aura, - BrowserView* browser_view, - BrowserFrame* browser_frame) + BrowserView* browser_view) : DesktopWindowTreeHostX11(native_widget_delegate, desktop_native_widget_aura), browser_view_(browser_view) { - scoped_ptr<ui::ThemeProvider> theme_provider( - new DesktopThemeProvider(ThemeServiceFactory::GetForProfile( - browser_view->browser()->profile()))); - browser_frame->SetThemeProvider(theme_provider.Pass()); } BrowserDesktopWindowTreeHostX11::~BrowserDesktopWindowTreeHostX11() { @@ -129,6 +67,5 @@ BrowserDesktopWindowTreeHost* BrowserFrame* browser_frame) { return new BrowserDesktopWindowTreeHostX11(native_widget_delegate, desktop_native_widget_aura, - browser_view, - browser_frame); + browser_view); } diff --git a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.h b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.h index 1ed2264..d746c80 100644 --- a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.h +++ b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.h @@ -23,8 +23,7 @@ class BrowserDesktopWindowTreeHostX11 BrowserDesktopWindowTreeHostX11( views::internal::NativeWidgetDelegate* native_widget_delegate, views::DesktopNativeWidgetAura* desktop_native_widget_aura, - BrowserView* browser_view, - BrowserFrame* browser_frame); + BrowserView* browser_view); virtual ~BrowserDesktopWindowTreeHostX11(); private: 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 dd411c7..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,13 +19,11 @@ namespace chrome { BrowserNonClientFrameView* CreateBrowserNonClientFrameView( BrowserFrame* frame, BrowserView* browser_view) { -#if defined(USE_AURA) && !defined(OS_CHROMEOS) +#if defined(OS_WIN) if (browser_view->browser()-> host_desktop_type() == chrome::HOST_DESKTOP_TYPE_NATIVE) { -#if defined(OS_WIN) if (frame->ShouldUseNativeFrame()) return new GlassBrowserFrameView(frame, browser_view); -#endif return new OpaqueBrowserFrameView(frame, browser_view); } #endif diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc index 71d49f4..76f2329 100644 --- a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc +++ b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc @@ -1503,7 +1503,7 @@ void DragSingleTabToSeparateWindowInSecondDisplayStep2( #define MAYBE_DragSingleTabToSeparateWindowInSecondDisplay \ DISABLED_DragSingleTabToSeparateWindowInSecondDisplay #else -#define MAYBE_DragSingleTabToSeparateWindowInSecondDisplay \ +#define MAYBE_DragSingleTabToSeparateWindow \ DragSingleTabToSeparateWindowInSecondDisplay #endif // Drags from browser to a second display and releases input. @@ -2047,7 +2047,7 @@ void CancelDragTabToWindowInSeparateDisplayStep2( } // namespace -#if defined(OS_CHROMEOS) || defined(OS_LINUX) +#if defined(OS_CHROMEOS) // TODO(sky,sad): Disabled as it fails due to resize locks with a real // compositor. crbug.com/331924 #define MAYBE_CancelDragTabToWindowIn2ndDisplay \ @@ -2094,7 +2094,7 @@ IN_PROC_BROWSER_TEST_F( ui_controls::LEFT, ui_controls::UP)); } -#if defined(OS_CHROMEOS) || defined(OS_LINUX) +#if defined(OS_CHROMEOS) // TODO(sky,sad): Disabled as it fails due to resize locks with a real // compositor. crbug.com/331924 #define MAYBE_CancelDragTabToWindowIn1stDisplay \ @@ -2318,7 +2318,7 @@ IN_PROC_BROWSER_TEST_P(DetachToDockedTabDragControllerTest, #endif -#if defined(USE_ASH) && defined(OS_CHROMEOS) // TODO(win_ash,linux_ash) +#if defined(USE_ASH) && !defined(OS_WIN) // TODO(win_ash) INSTANTIATE_TEST_CASE_P(TabDragging, DetachToBrowserInSeparateDisplayTabDragControllerTest, ::testing::Values("mouse", "touch")); @@ -2334,7 +2334,7 @@ INSTANTIATE_TEST_CASE_P(TabDragging, INSTANTIATE_TEST_CASE_P(TabDragging, DetachToBrowserTabDragControllerTestTouch, ::testing::Values("touch", "touch docked")); -#elif defined(USE_ASH) && !defined(OS_LINUX) // TODO(linux_ash) +#else INSTANTIATE_TEST_CASE_P(TabDragging, DetachToBrowserTabDragControllerTest, ::testing::Values("mouse")); diff --git a/chrome/browser/ui/views/theme_image_mapper_chromeos.cc b/chrome/browser/ui/views/theme_image_mapper.cc index 14ea061..14ea061 100644 --- a/chrome/browser/ui/views/theme_image_mapper_chromeos.cc +++ b/chrome/browser/ui/views/theme_image_mapper.cc diff --git a/chrome/browser/ui/views/theme_image_mapper_desktop.cc b/chrome/browser/ui/views/theme_image_mapper_aura_win.cc index 62dda54..8ef3bb0 100644 --- a/chrome/browser/ui/views/theme_image_mapper_desktop.cc +++ b/chrome/browser/ui/views/theme_image_mapper_aura_win.cc @@ -14,23 +14,23 @@ int MapThemeImage(HostDesktopType desktop_type, int resource) { switch (resource) { case IDR_CONTENT_TOP_CENTER: - return IDR_CONTENT_TOP_CENTER_DESKTOP; + return IDR_CONTENT_TOP_CENTER_WIN; case IDR_OTR_ICON: - return IDR_OTR_ICON_DESKTOP; + return IDR_OTR_ICON_WIN; case IDR_THEME_FRAME: - return IDR_THEME_FRAME_DESKTOP; + return IDR_THEME_FRAME_WIN; case IDR_THEME_FRAME_INACTIVE: - return IDR_THEME_FRAME_INACTIVE_DESKTOP; + return IDR_THEME_FRAME_INACTIVE_WIN; case IDR_THEME_FRAME_INCOGNITO: - return IDR_THEME_FRAME_INCOGNITO_DESKTOP; + return IDR_THEME_FRAME_INCOGNITO_WIN; case IDR_THEME_FRAME_INCOGNITO_INACTIVE: - return IDR_THEME_FRAME_INCOGNITO_INACTIVE_DESKTOP; + return IDR_THEME_FRAME_INCOGNITO_INACTIVE_WIN; case IDR_THEME_TAB_BACKGROUND: - return IDR_THEME_TAB_BACKGROUND_DESKTOP; + return IDR_THEME_TAB_BACKGROUND_WIN; case IDR_THEME_TAB_BACKGROUND_INCOGNITO: - return IDR_THEME_TAB_BACKGROUND_INCOGNITO_DESKTOP; + return IDR_THEME_TAB_BACKGROUND_INCOGNITO_WIN; case IDR_THEME_TOOLBAR: - return IDR_THEME_TOOLBAR_DESKTOP; + return IDR_THEME_TOOLBAR_WIN; default: break; } diff --git a/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc b/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc index a688ebf..4637433 100644 --- a/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc +++ b/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc @@ -67,7 +67,7 @@ void OpenBrowserUsingShelfOnRootWindow(aura::Window* root_window) { } // namespace -#if !defined(OS_CHROMEOS) +#if defined(OS_WIN) #define MAYBE_OpenBrowserUsingShelfOnOtherDisplay DISABLED_OpenBrowserUsingShelfOnOtherDisplay #define MAYBE_OpenBrowserUsingContextMenuOnOtherDisplay DISABLED_OpenBrowserUsingContextMenuOnOtherDisplay #else diff --git a/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc b/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc index 4bd32d5..a33aa20 100644 --- a/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc +++ b/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc @@ -92,17 +92,9 @@ scoped_ptr<TestBrowserWindowAura> CreateTestBrowserWindow( } // namespace -// On desktop linux aura, we currently don't use the ash frame, breaking some -// tests which expect ash sizes: http://crbug.com/303862 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -#define MAYBE_DefaultSizeCase DISABLED_DefaultSizeCase -#else -#define MAYBE_DefaultSizeCase DefaultSizeCase -#endif - // Test that the window is sized appropriately for the first run experience // where the default window bounds calculation is invoked. -TEST_F(WindowSizerAshTest, MAYBE_DefaultSizeCase) { +TEST_F(WindowSizerAshTest, DefaultSizeCase) { #if defined(OS_WIN) CommandLine::ForCurrentProcess()->AppendSwitch(switches::kOpenAsh); #endif @@ -459,16 +451,8 @@ TEST_F(WindowSizerAshTest, LastWindowOffscreenWithNonAggressiveRepositioning) { } } -// On desktop linux aura, we currently don't use the ash frame, breaking some -// tests which expect ash sizes: http://crbug.com/303862 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -#define MAYBE_PlaceNewWindows DISABLED_PlaceNewWindows -#else -#define MAYBE_PlaceNewWindows PlaceNewWindows -#endif - // Test the placement of newly created windows. -TEST_F(WindowSizerAshTest, MAYBE_PlaceNewWindows) { +TEST_F(WindowSizerAshTest, PlaceNewWindows) { // Create a browser which we can use to pass into the GetWindowBounds // function. scoped_ptr<TestingProfile> profile(new TestingProfile()); @@ -537,18 +521,10 @@ TEST_F(WindowSizerAshTest, MAYBE_PlaceNewWindows) { } } -// On desktop linux aura, we currently don't use the ash frame, breaking some -// tests which expect ash sizes: http://crbug.com/303862 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -#define MAYBE_PlaceNewBrowserWindowOnEmptyDesktop DISABLED_PlaceNewBrowserWindowOnEmptyDesktop -#else -#define MAYBE_PlaceNewBrowserWindowOnEmptyDesktop PlaceNewBrowserWindowOnEmptyDesktop -#endif - // Test the placement of newly created windows on an empty desktop. // This test supplements "PlaceNewWindows" by testing the creation of a newly // created browser window on an empty desktop. -TEST_F(WindowSizerAshTest, MAYBE_PlaceNewBrowserWindowOnEmptyDesktop) { +TEST_F(WindowSizerAshTest, PlaceNewBrowserWindowOnEmptyDesktop) { // Create a browser which we can use to pass into the GetWindowBounds // function. scoped_ptr<TestingProfile> profile(new TestingProfile()); @@ -719,16 +695,8 @@ TEST_F(WindowSizerAshTest, MAYBE_PlaceNewWindowsOnMultipleDisplays) { } } -// On desktop linux aura, we currently don't use the ash frame, breaking some -// tests which expect ash sizes: http://crbug.com/303862 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -#define MAYBE_TestShowState DISABLED_TestShowState -#else -#define MAYBE_TestShowState TestShowState -#endif - // Test that the show state is properly returned for non default cases. -TEST_F(WindowSizerAshTest, MAYBE_TestShowState) { +TEST_F(WindowSizerAshTest, TestShowState) { scoped_ptr<TestingProfile> profile(new TestingProfile()); // Creating a browser & window to play with. diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 398d89d..0ec1448 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -2953,7 +2953,6 @@ 'browser/first_run/upgrade_util.cc', 'browser/first_run/upgrade_util.h', 'browser/first_run/upgrade_util_linux.cc', - 'browser/fullscreen_aurax11.cc', 'browser/icon_loader_auralinux.cc', 'browser/idle_linux.cc', 'browser/password_manager/native_backend_gnome_x.cc', @@ -3013,6 +3012,11 @@ '../build/linux/system.gyp:gnome_keyring', ], }], + ['use_ash==1', { + 'sources!': [ + 'browser/fullscreen_aurax11.cc', + ], + }], ['use_aura==1', { 'sources/': [ ['exclude', '^browser/lifetime/application_lifetime_stub.cc'], diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi index 58a2954..8c2a40f 100644 --- a/chrome/chrome_browser_ui.gypi +++ b/chrome/chrome_browser_ui.gypi @@ -360,8 +360,6 @@ 'browser/ui/ash/session_state_delegate_chromeos.h', 'browser/ui/ash/session_state_delegate_views.cc', 'browser/ui/ash/session_state_delegate_views.h', - 'browser/ui/ash/solid_color_user_wallpaper_delegate.cc', - 'browser/ui/ash/solid_color_user_wallpaper_delegate.h', 'browser/ui/ash/stub_user_accounts_delegate.cc', 'browser/ui/ash/stub_user_accounts_delegate.h', 'browser/ui/ash/system_tray_delegate_chromeos.cc', @@ -370,6 +368,8 @@ 'browser/ui/ash/system_tray_delegate_win.h', 'browser/ui/ash/user_accounts_delegate_chromeos.cc', 'browser/ui/ash/user_accounts_delegate_chromeos.h', + 'browser/ui/ash/user_wallpaper_delegate_win.cc', + 'browser/ui/ash/user_wallpaper_delegate_win.h', 'browser/ui/ash/volume_controller_chromeos.cc', 'browser/ui/ash/volume_controller_chromeos.h', 'browser/ui/aura/active_desktop_monitor.cc', @@ -1913,9 +1913,9 @@ 'browser/ui/views/tabs/window_finder_win.cc', 'browser/ui/views/tabs/window_finder_x11.cc', 'browser/ui/views/task_manager_view.cc', + 'browser/ui/views/theme_image_mapper.cc', 'browser/ui/views/theme_image_mapper.h', - 'browser/ui/views/theme_image_mapper_chromeos.cc', - 'browser/ui/views/theme_image_mapper_desktop.cc', + 'browser/ui/views/theme_image_mapper_aura_win.cc', 'browser/ui/views/toolbar/back_button.cc', 'browser/ui/views/toolbar/back_button.h', 'browser/ui/views/toolbar/browser_action_test_util_views.cc', @@ -2669,7 +2669,7 @@ 'browser/ui/views/message_center/web_notification_tray.cc', ], }], - ['use_aura==1 and chromeos==0 and use_ozone==0 and OS=="linux"', { + ['use_aura==1 and use_ash==0 and use_ozone==0 and OS=="linux"', { 'dependencies': [ # gtk2 is the only component that can interact with gtk2 in our new # world. @@ -2710,6 +2710,7 @@ ['OS=="win"', { 'sources/': [ ['exclude', '^browser/ui/views/apps/chrome_app_window_delegate_views.cc'], + ['exclude', '^browser/ui/views/theme_image_mapper.cc'], ['exclude', '^browser/ui/webui/certificate_viewer_webui.cc'], ['exclude', '^browser/ui/webui/certificate_viewer_webui.h'], ['exclude', '^browser/ui/webui/certificate_viewer_ui.cc'], @@ -2738,6 +2739,7 @@ ['exclude', '^browser/ui/views/frame/browser_desktop_window_tree_host_win.h'], ['exclude', '^browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc'], ['exclude', '^browser/ui/views/frame/browser_desktop_window_tree_host_x11.h'], + ['exclude', '^browser/ui/views/theme_image_mapper_aura_win.cc'], ['exclude', '^browser/ui/webui/gesture_config_ui.cc'], ['exclude', '^browser/ui/webui/gesture_config_ui.h'], ['exclude', '^browser/ui/webui/salsa_ui.cc'], diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 36a21b9..b7d430f 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1798,20 +1798,10 @@ ], }], ], - }, { # else: OS != "win" - 'sources!': [ - 'app/chrome_command_ids.h', - 'app/chrome_dll.rc', - 'app/chrome_dll_resource.h', - 'app/chrome_version.rc.version', - ], - }], - ['chromeos==0 and use_aura==1', { 'sources!': [ - # On Windows and Linux, we currently don't support enough of the - # ash environment to run these unit tests. - # - # TODO: enable these on windows and linux. + # use_aura currently sets use_ash on Windows. So take these tests out + # for win aura builds. + # TODO: enable these for win_ash browser tests. 'browser/chromeos/system/tray_accessibility_browsertest.cc', 'browser/ui/ash/accelerator_commands_browsertest.cc', 'browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc', @@ -1820,6 +1810,13 @@ 'browser/ui/views/frame/app_non_client_frame_view_ash_browsertest.cc', 'browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc', ], + }, { # else: OS != "win" + 'sources!': [ + 'app/chrome_command_ids.h', + 'app/chrome_dll.rc', + 'app/chrome_dll_resource.h', + 'app/chrome_version.rc.version', + ], }], ['OS=="linux"', { 'dependencies': [ diff --git a/chrome/installer/linux/debian/expected_deps b/chrome/installer/linux/debian/expected_deps index ffe7ef2..a0a49c9 100644 --- a/chrome/installer/linux/debian/expected_deps +++ b/chrome/installer/linux/debian/expected_deps @@ -24,7 +24,7 @@ libxcomposite1 (>= 1:0.3-1) libxcursor1 (>> 1.1.2) libxdamage1 (>= 1:1.1) libxext6 -libxfixes3 (>= 1:5.0) +libxfixes3 libxi6 (>= 2:1.2.99.4) libxrandr2 (>= 2:1.2.99.2) libxrender1 diff --git a/chrome/test/base/view_event_test_base.cc b/chrome/test/base/view_event_test_base.cc index 78fe294..bdba76a 100644 --- a/chrome/test/base/view_event_test_base.cc +++ b/chrome/test/base/view_event_test_base.cc @@ -111,13 +111,13 @@ void ViewEventTestBase::SetUp() { ui::InitializeContextFactoryForTests(enable_pixel_output); #if defined(USE_ASH) -#if !defined(OS_CHROMEOS) +#if defined(OS_WIN) // http://crbug.com/154081 use ash::Shell code path below on win_ash bots when // interactive_ui_tests is brought up on that platform. gfx::Screen::SetScreenInstance( gfx::SCREEN_TYPE_NATIVE, views::CreateDesktopScreen()); -#else // !OS_CHROMEOS +#else // !OS_WIN // Ash Shell can't just live on its own without a browser process, we need to // also create the message center. message_center::MessageCenter::Initialize(); @@ -133,7 +133,7 @@ void ViewEventTestBase::SetUp() { ->SetActiveUserSessionStarted(true); context = ash::Shell::GetPrimaryRootWindow(); context->GetHost()->Show(); -#endif // !OS_CHROMEOS +#endif // !OS_WIN aura::Env::CreateInstance(true); #elif defined(USE_AURA) // Instead of using the ash shell, use an AuraTestHelper to create and manage @@ -158,15 +158,17 @@ void ViewEventTestBase::TearDown() { ui::Clipboard::DestroyClipboardForCurrentThread(); #if defined(USE_ASH) -#if defined(OS_CHROMEOS) +#if !defined(OS_WIN) ash::Shell::DeleteInstance(); +#if defined(OS_CHROMEOS) chromeos::NetworkHandler::Shutdown(); chromeos::CrasAudioHandler::Shutdown(); chromeos::DBusThreadManager::Shutdown(); +#endif // Ash Shell can't just live on its own without a browser process, we need to // also shut down the message center. message_center::MessageCenter::Shutdown(); -#endif +#endif // !OS_WIN aura::Env::DeleteInstance(); #elif defined(USE_AURA) aura_test_helper_->TearDown(); diff --git a/ui/shell_dialogs/select_file_dialog.cc b/ui/shell_dialogs/select_file_dialog.cc index e0449a7..2496ced 100644 --- a/ui/shell_dialogs/select_file_dialog.cc +++ b/ui/shell_dialogs/select_file_dialog.cc @@ -20,7 +20,7 @@ #include "ui/shell_dialogs/select_file_dialog_mac.h" #elif defined(OS_ANDROID) #include "ui/shell_dialogs/select_file_dialog_android.h" -#elif defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS) +#elif defined(USE_AURA) && !defined(USE_ASH) && defined(OS_LINUX) #include "ui/shell_dialogs/linux_shell_dialog.h" #endif @@ -76,7 +76,7 @@ scoped_refptr<SelectFileDialog> SelectFileDialog::Create( return dialog; } -#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(USE_AURA) && !defined(USE_ASH) && defined(OS_LINUX) const ui::LinuxShellDialog* shell_dialogs = ui::LinuxShellDialog::instance(); if (shell_dialogs) return shell_dialogs->CreateSelectFileDialog(listener, policy); |