| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_CHROMEOS_FRAME_PANEL_BROWSER_VIEW_H_ | 5 #ifndef CHROME_BROWSER_CHROMEOS_FRAME_PANEL_BROWSER_VIEW_H_ |
| 6 #define CHROME_BROWSER_CHROMEOS_FRAME_PANEL_BROWSER_VIEW_H_ | 6 #define CHROME_BROWSER_CHROMEOS_FRAME_PANEL_BROWSER_VIEW_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include "app/x11_util.h" | |
| 10 #include "base/scoped_ptr.h" | 9 #include "base/scoped_ptr.h" |
| 11 #include "chrome/browser/chromeos/frame/panel_controller.h" | 10 #include "chrome/browser/chromeos/frame/panel_controller.h" |
| 12 #include "chrome/browser/ui/views/frame/browser_view.h" | 11 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 12 #include "ui/base/x/x11_util.h" |
| 13 | 13 |
| 14 class Browser; | 14 class Browser; |
| 15 | 15 |
| 16 namespace chromeos { | 16 namespace chromeos { |
| 17 | 17 |
| 18 class PanelController; | 18 class PanelController; |
| 19 | 19 |
| 20 // A browser view that implements Panel specific behavior. | 20 // A browser view that implements Panel specific behavior. |
| 21 // NOTE: This inherits from ::BrowserView in chrome/browser/ui/views/frame/, | 21 // NOTE: This inherits from ::BrowserView in chrome/browser/ui/views/frame/, |
| 22 // not chromeos::BrowserView in chrome/browser/chromeos/frame/. | 22 // not chromeos::BrowserView in chrome/browser/chromeos/frame/. |
| (...skipping 28 matching lines...) Expand all Loading... |
| 51 // X id for the content window of the panel that created this | 51 // X id for the content window of the panel that created this |
| 52 // panel. This tells ChromeOS that it should be created next to the | 52 // panel. This tells ChromeOS that it should be created next to the |
| 53 // content window of this panel. | 53 // content window of this panel. |
| 54 XID creator_xid_; | 54 XID creator_xid_; |
| 55 DISALLOW_COPY_AND_ASSIGN(PanelBrowserView); | 55 DISALLOW_COPY_AND_ASSIGN(PanelBrowserView); |
| 56 }; | 56 }; |
| 57 | 57 |
| 58 } // namespace chromeos | 58 } // namespace chromeos |
| 59 | 59 |
| 60 #endif // CHROME_BROWSER_CHROMEOS_FRAME_PANEL_BROWSER_VIEW_H_ | 60 #endif // CHROME_BROWSER_CHROMEOS_FRAME_PANEL_BROWSER_VIEW_H_ |
| OLD | NEW |