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

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

Issue 10134036: Let Chrome app handle Ash accelerators first if the app is launched as a window (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: final rebase Created 8 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « ui/views/focus/focus_manager_delegate.h ('k') | ui/views/focus/focus_manager_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 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 { 10 namespace {
11 11
12 using views::FocusManager; 12 using views::FocusManager;
13 13
14 class DefaultFocusManagerFactory : public views::FocusManagerFactory { 14 class DefaultFocusManagerFactory : public views::FocusManagerFactory {
15 public: 15 public:
16 DefaultFocusManagerFactory() : views::FocusManagerFactory() {} 16 DefaultFocusManagerFactory() : views::FocusManagerFactory() {}
17 virtual ~DefaultFocusManagerFactory() {} 17 virtual ~DefaultFocusManagerFactory() {}
18 18
19 protected: 19 protected:
20 virtual FocusManager* CreateFocusManager(views::Widget* widget) OVERRIDE { 20 virtual FocusManager* CreateFocusManager(views::Widget* widget) OVERRIDE {
21 return new FocusManager(widget); 21 return new FocusManager(widget, NULL /* delegate */);
22 } 22 }
23 23
24 private: 24 private:
25 DISALLOW_COPY_AND_ASSIGN(DefaultFocusManagerFactory); 25 DISALLOW_COPY_AND_ASSIGN(DefaultFocusManagerFactory);
26 }; 26 };
27 27
28 views::FocusManagerFactory* focus_manager_factory = NULL; 28 views::FocusManagerFactory* focus_manager_factory = NULL;
29 29
30 } // namespace 30 } // namespace
31 31
(...skipping 14 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
« no previous file with comments | « ui/views/focus/focus_manager_delegate.h ('k') | ui/views/focus/focus_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698