OLD | NEW |
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/extensions/shell_window_registry.h" | 5 #include "chrome/browser/extensions/shell_window_registry.h" |
6 #include "chrome/browser/profiles/profile_dependency_manager.h" | 6 #include "chrome/browser/profiles/profile_dependency_manager.h" |
7 #include "chrome/browser/ui/extensions/shell_window.h" | 7 #include "chrome/browser/ui/extensions/shell_window.h" |
8 #include "chrome/common/extensions/extension.h" | 8 #include "chrome/common/extensions/extension.h" |
9 #include "content/public/browser/render_view_host.h" | 9 #include "content/public/browser/render_view_host.h" |
10 #include "content/public/browser/web_contents.h" | 10 #include "content/public/browser/web_contents.h" |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
55 return *i; | 55 return *i; |
56 } | 56 } |
57 | 57 |
58 return NULL; | 58 return NULL; |
59 } | 59 } |
60 | 60 |
61 ShellWindow* ShellWindowRegistry::GetShellWindowForNativeWindow( | 61 ShellWindow* ShellWindowRegistry::GetShellWindowForNativeWindow( |
62 gfx::NativeWindow window) const { | 62 gfx::NativeWindow window) const { |
63 for (ShellWindowSet::const_iterator i = shell_windows_.begin(); | 63 for (ShellWindowSet::const_iterator i = shell_windows_.begin(); |
64 i != shell_windows_.end(); ++i) { | 64 i != shell_windows_.end(); ++i) { |
65 if ((*i)->GetNativeWindow() == window) | 65 if ((*i)->GetBaseWindow()->GetNativeWindow() == window) |
66 return *i; | 66 return *i; |
67 } | 67 } |
68 | 68 |
69 return NULL; | 69 return NULL; |
70 } | 70 } |
71 | 71 |
72 /////////////////////////////////////////////////////////////////////////////// | 72 /////////////////////////////////////////////////////////////////////////////// |
73 // Factory boilerplate | 73 // Factory boilerplate |
74 | 74 |
75 // static | 75 // static |
(...skipping 20 matching lines...) Expand all Loading... |
96 return new ShellWindowRegistry(); | 96 return new ShellWindowRegistry(); |
97 } | 97 } |
98 | 98 |
99 bool ShellWindowRegistry::Factory::ServiceIsCreatedWithProfile() { | 99 bool ShellWindowRegistry::Factory::ServiceIsCreatedWithProfile() { |
100 return true; | 100 return true; |
101 } | 101 } |
102 | 102 |
103 bool ShellWindowRegistry::Factory::ServiceIsNULLWhileTesting() { | 103 bool ShellWindowRegistry::Factory::ServiceIsNULLWhileTesting() { |
104 return false; | 104 return false; |
105 } | 105 } |
OLD | NEW |