| OLD | NEW |
| 1 // Copyright (c) 2010 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_BROWSER_VIEW_H_ | 5 #ifndef CHROME_BROWSER_CHROMEOS_FRAME_BROWSER_VIEW_H_ |
| 6 #define CHROME_BROWSER_CHROMEOS_FRAME_BROWSER_VIEW_H_ | 6 #define CHROME_BROWSER_CHROMEOS_FRAME_BROWSER_VIEW_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| 11 #include "chrome/browser/chromeos/status/status_area_host.h" | 11 #include "chrome/browser/chromeos/status/status_area_host.h" |
| 12 #include "chrome/browser/views/frame/browser_view.h" | 12 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 13 #include "views/controls/menu/menu_wrapper.h" | 13 #include "views/controls/menu/menu_wrapper.h" |
| 14 | 14 |
| 15 class AccessibleToolbarView; | 15 class AccessibleToolbarView; |
| 16 class TabStripModel; | 16 class TabStripModel; |
| 17 | 17 |
| 18 namespace menus { | 18 namespace menus { |
| 19 class SimpleMenuModel; | 19 class SimpleMenuModel; |
| 20 } // namespace menus | 20 } // namespace menus |
| 21 | 21 |
| 22 namespace views { | 22 namespace views { |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 // Focused native widget before wench menu shows up. We need this to properly | 97 // Focused native widget before wench menu shows up. We need this to properly |
| 98 // perform cut, copy and paste. See http://crosbug.com/8496 | 98 // perform cut, copy and paste. See http://crosbug.com/8496 |
| 99 gfx::NativeView saved_focused_widget_; | 99 gfx::NativeView saved_focused_widget_; |
| 100 | 100 |
| 101 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 101 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
| 102 }; | 102 }; |
| 103 | 103 |
| 104 } // namespace chromeos | 104 } // namespace chromeos |
| 105 | 105 |
| 106 #endif // CHROME_BROWSER_CHROMEOS_FRAME_BROWSER_VIEW_H_ | 106 #endif // CHROME_BROWSER_CHROMEOS_FRAME_BROWSER_VIEW_H_ |
| OLD | NEW |