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

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

Issue 2351893002: mash: Fix system tray clock 12/24 hour time setting (Closed)
Patch Set: review comments Created 4 years, 3 months 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 #ifndef CHROME_BROWSER_UI_VIEWS_ASH_CHROME_BROWSER_MAIN_EXTRA_PARTS_ASH_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_ASH_CHROME_BROWSER_MAIN_EXTRA_PARTS_ASH_H_
6 #define CHROME_BROWSER_UI_VIEWS_ASH_CHROME_BROWSER_MAIN_EXTRA_PARTS_ASH_H_ 6 #define CHROME_BROWSER_UI_VIEWS_ASH_CHROME_BROWSER_MAIN_EXTRA_PARTS_ASH_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/compiler_specific.h"
11 #include "base/macros.h" 10 #include "base/macros.h"
12 #include "chrome/browser/chrome_browser_main_extra_parts.h" 11 #include "chrome/browser/chrome_browser_main_extra_parts.h"
13 12
14 class ImmersiveContextMus; 13 class ImmersiveContextMus;
15 class ImmersiveHandlerFactoryMus; 14 class ImmersiveHandlerFactoryMus;
15 class SystemTrayControllerMus;
16 16
17 class ChromeBrowserMainExtraPartsAsh : public ChromeBrowserMainExtraParts { 17 class ChromeBrowserMainExtraPartsAsh : public ChromeBrowserMainExtraParts {
18 public: 18 public:
19 ChromeBrowserMainExtraPartsAsh(); 19 ChromeBrowserMainExtraPartsAsh();
20 ~ChromeBrowserMainExtraPartsAsh() override; 20 ~ChromeBrowserMainExtraPartsAsh() override;
21 21
22 // Overridden from ChromeBrowserMainExtraParts: 22 // Overridden from ChromeBrowserMainExtraParts:
23 void PreProfileInit() override; 23 void PreProfileInit() override;
24 void PostProfileInit() override; 24 void PostProfileInit() override;
25 void PostMainMessageLoopRun() override; 25 void PostMainMessageLoopRun() override;
26 26
27 private: 27 private:
28 std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory_; 28 std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory_;
29 std::unique_ptr<ImmersiveContextMus> immersive_context_; 29 std::unique_ptr<ImmersiveContextMus> immersive_context_;
30 std::unique_ptr<SystemTrayControllerMus> system_tray_controller_;
30 31
31 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsAsh); 32 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsAsh);
32 }; 33 };
33 34
34 #endif // CHROME_BROWSER_UI_VIEWS_ASH_CHROME_BROWSER_MAIN_EXTRA_PARTS_ASH_H_ 35 #endif // CHROME_BROWSER_UI_VIEWS_ASH_CHROME_BROWSER_MAIN_EXTRA_PARTS_ASH_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698