Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(358)

Side by Side Diff: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc

Issue 686553002: Standardize usage of virtual/override/final specifiers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h" 5 #include "chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h"
6 6
7 #include "ash/root_window_controller.h" 7 #include "ash/root_window_controller.h"
8 #include "ash/session/session_state_delegate.h" 8 #include "ash/session/session_state_delegate.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 20 matching lines...) Expand all
31 #endif 31 #endif
32 32
33 #if defined(OS_WIN) 33 #if defined(OS_WIN)
34 #include "base/win/windows_version.h" 34 #include "base/win/windows_version.h"
35 #endif 35 #endif
36 36
37 #if !defined(OS_CHROMEOS) 37 #if !defined(OS_CHROMEOS)
38 class ScreenTypeDelegateWin : public gfx::ScreenTypeDelegate { 38 class ScreenTypeDelegateWin : public gfx::ScreenTypeDelegate {
39 public: 39 public:
40 ScreenTypeDelegateWin() {} 40 ScreenTypeDelegateWin() {}
41 virtual gfx::ScreenType GetScreenTypeForNativeView( 41 gfx::ScreenType GetScreenTypeForNativeView(gfx::NativeView view) override {
42 gfx::NativeView view) override {
43 return chrome::IsNativeViewInAsh(view) ? 42 return chrome::IsNativeViewInAsh(view) ?
44 gfx::SCREEN_TYPE_ALTERNATE : 43 gfx::SCREEN_TYPE_ALTERNATE :
45 gfx::SCREEN_TYPE_NATIVE; 44 gfx::SCREEN_TYPE_NATIVE;
46 } 45 }
47 private: 46 private:
48 DISALLOW_COPY_AND_ASSIGN(ScreenTypeDelegateWin); 47 DISALLOW_COPY_AND_ASSIGN(ScreenTypeDelegateWin);
49 }; 48 };
50 49
51 class ShellDialogsDelegateWin : public ui::ShellDialogsDelegate { 50 class ShellDialogsDelegateWin : public ui::ShellDialogsDelegate {
52 public: 51 public:
53 ShellDialogsDelegateWin() {} 52 ShellDialogsDelegateWin() {}
54 virtual bool IsWindowInMetro(gfx::NativeWindow window) override { 53 bool IsWindowInMetro(gfx::NativeWindow window) override {
55 #if defined(OS_WIN) 54 #if defined(OS_WIN)
56 if (base::win::GetVersion() < base::win::VERSION_WIN8) 55 if (base::win::GetVersion() < base::win::VERSION_WIN8)
57 return false; 56 return false;
58 #endif 57 #endif
59 return chrome::IsNativeViewInAsh(window); 58 return chrome::IsNativeViewInAsh(window);
60 } 59 }
61 private: 60 private:
62 DISALLOW_COPY_AND_ASSIGN(ShellDialogsDelegateWin); 61 DISALLOW_COPY_AND_ASSIGN(ShellDialogsDelegateWin);
63 }; 62 };
64 63
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 TabScrubber::GetInstance(); 106 TabScrubber::GetInstance();
108 // Activate virtual keyboard after profile is initialized. It depends on the 107 // Activate virtual keyboard after profile is initialized. It depends on the
109 // default profile. 108 // default profile.
110 ash::Shell::GetPrimaryRootWindowController()->ActivateKeyboard( 109 ash::Shell::GetPrimaryRootWindowController()->ActivateKeyboard(
111 keyboard::KeyboardController::GetInstance()); 110 keyboard::KeyboardController::GetInstance());
112 } 111 }
113 112
114 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() { 113 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() {
115 chrome::CloseAsh(); 114 chrome::CloseAsh();
116 } 115 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h ('k') | chrome/browser/ui/views/ash/tab_scrubber.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698