| Index: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
|
| 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 1c0dd7eac6a945ab7841294521dda90fe71f1573..1f8020c991ca8e0f4c347c10546c8f7c446a9041 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
|
| @@ -38,8 +38,7 @@
|
| class ScreenTypeDelegateWin : public gfx::ScreenTypeDelegate {
|
| public:
|
| ScreenTypeDelegateWin() {}
|
| - virtual gfx::ScreenType GetScreenTypeForNativeView(
|
| - gfx::NativeView view) override {
|
| + gfx::ScreenType GetScreenTypeForNativeView(gfx::NativeView view) override {
|
| return chrome::IsNativeViewInAsh(view) ?
|
| gfx::SCREEN_TYPE_ALTERNATE :
|
| gfx::SCREEN_TYPE_NATIVE;
|
| @@ -51,7 +50,7 @@ class ScreenTypeDelegateWin : public gfx::ScreenTypeDelegate {
|
| class ShellDialogsDelegateWin : public ui::ShellDialogsDelegate {
|
| public:
|
| ShellDialogsDelegateWin() {}
|
| - virtual bool IsWindowInMetro(gfx::NativeWindow window) override {
|
| + bool IsWindowInMetro(gfx::NativeWindow window) override {
|
| #if defined(OS_WIN)
|
| if (base::win::GetVersion() < base::win::VERSION_WIN8)
|
| return false;
|
|
|