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

Side by Side Diff: ui/views/focus/focus_manager_factory.cc

Issue 838253004: MacViews: Fix duplicate definition of ExtensionKeyBindingRegistry::SetShortcutHandlingSuspended (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@DragBookmarks2
Patch Set: Created 5 years, 11 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 #include "ui/views/focus/focus_manager_factory.h" 5 #include "ui/views/focus/focus_manager_factory.h"
6 6
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "ui/views/focus/focus_manager.h" 8 #include "ui/views/focus/focus_manager.h"
9 9
10 namespace views { 10 namespace views {
11 11
12 namespace { 12 namespace {
13 13
14 class DefaultFocusManagerFactory : public FocusManagerFactory { 14 class DefaultFocusManagerFactory : public FocusManagerFactory {
15 public: 15 public:
16 DefaultFocusManagerFactory() : FocusManagerFactory() {} 16 DefaultFocusManagerFactory() : FocusManagerFactory() {}
17 ~DefaultFocusManagerFactory() override {} 17 ~DefaultFocusManagerFactory() override {}
18 18
19 protected: 19 protected:
20 FocusManager* CreateFocusManager(Widget* widget, 20 FocusManager* CreateFocusManager(Widget* widget,
21 bool desktop_widget) override { 21 bool desktop_widget) override {
22 return new FocusManager(widget, NULL /* delegate */); 22 return new FocusManager(widget);
23 } 23 }
24 24
25 private: 25 private:
26 DISALLOW_COPY_AND_ASSIGN(DefaultFocusManagerFactory); 26 DISALLOW_COPY_AND_ASSIGN(DefaultFocusManagerFactory);
27 }; 27 };
28 28
29 FocusManagerFactory* focus_manager_factory = NULL; 29 FocusManagerFactory* focus_manager_factory = NULL;
30 30
31 } // namespace 31 } // namespace
32 32
(...skipping 13 matching lines...) Expand all
46 46
47 // static 47 // static
48 void FocusManagerFactory::Install(FocusManagerFactory* f) { 48 void FocusManagerFactory::Install(FocusManagerFactory* f) {
49 if (f == focus_manager_factory) 49 if (f == focus_manager_factory)
50 return; 50 return;
51 delete focus_manager_factory; 51 delete focus_manager_factory;
52 focus_manager_factory = f ? f : new DefaultFocusManagerFactory(); 52 focus_manager_factory = f ? f : new DefaultFocusManagerFactory();
53 } 53 }
54 54
55 } // namespace views 55 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698