| 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_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 |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 namespace views { | 23 namespace views { |
| 24 class ImageButton; | 24 class ImageButton; |
| 25 class ImageView; | 25 class ImageView; |
| 26 class Menu2; | 26 class Menu2; |
| 27 } // namespace views | 27 } // namespace views |
| 28 | 28 |
| 29 namespace chromeos { | 29 namespace chromeos { |
| 30 | 30 |
| 31 class StatusAreaView; | 31 class StatusAreaView; |
| 32 class StatusAreaButton; | 32 class StatusAreaButton; |
| 33 #if defined(TOUCH_UI) |
| 34 class DOMBrowserView; |
| 35 #endif |
| 36 |
| 33 | 37 |
| 34 // chromeos::BrowserView adds ChromeOS specific controls and menus to a | 38 // chromeos::BrowserView adds ChromeOS specific controls and menus to a |
| 35 // BrowserView created with Browser::TYPE_NORMAL. This extender adds controls | 39 // BrowserView created with Browser::TYPE_NORMAL. This extender adds controls |
| 36 // to the title bar as follows: | 40 // to the title bar as follows: |
| 37 // ____ __ __ | 41 // ____ __ __ |
| 38 // / \ \ \ [StatusArea] | 42 // / \ \ \ [StatusArea] |
| 39 // | 43 // |
| 40 // and adds the system context menu to the remaining arae of the titlebar. | 44 // and adds the system context menu to the remaining arae of the titlebar. |
| 41 class BrowserView : public ::BrowserView, | 45 class BrowserView : public ::BrowserView, |
| 42 public views::ContextMenuController, | 46 public views::ContextMenuController, |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 | 80 |
| 77 gfx::NativeView saved_focused_widget() const { | 81 gfx::NativeView saved_focused_widget() const { |
| 78 return saved_focused_widget_; | 82 return saved_focused_widget_; |
| 79 } | 83 } |
| 80 | 84 |
| 81 protected: | 85 protected: |
| 82 virtual void GetAccessiblePanes( | 86 virtual void GetAccessiblePanes( |
| 83 std::vector<AccessiblePaneView*>* panes); | 87 std::vector<AccessiblePaneView*>* panes); |
| 84 | 88 |
| 85 private: | 89 private: |
| 90 #if defined(TOUCH_UI) |
| 91 friend class DOMBrowserView; |
| 92 #endif |
| 93 |
| 86 void InitSystemMenu(); | 94 void InitSystemMenu(); |
| 87 | 95 |
| 88 // Status Area view. | 96 // Status Area view. |
| 89 StatusAreaView* status_area_; | 97 StatusAreaView* status_area_; |
| 90 | 98 |
| 91 // System menus. | 99 // System menus. |
| 92 scoped_ptr<ui::SimpleMenuModel> system_menu_contents_; | 100 scoped_ptr<ui::SimpleMenuModel> system_menu_contents_; |
| 93 scoped_ptr<views::Menu2> system_menu_menu_; | 101 scoped_ptr<views::Menu2> system_menu_menu_; |
| 94 | 102 |
| 95 // Focused native widget before wench menu shows up. We need this to properly | 103 // Focused native widget before wench menu shows up. We need this to properly |
| 96 // perform cut, copy and paste. See http://crosbug.com/8496 | 104 // perform cut, copy and paste. See http://crosbug.com/8496 |
| 97 gfx::NativeView saved_focused_widget_; | 105 gfx::NativeView saved_focused_widget_; |
| 98 | 106 |
| 99 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 107 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
| 100 }; | 108 }; |
| 101 | 109 |
| 102 } // namespace chromeos | 110 } // namespace chromeos |
| 103 | 111 |
| 104 #endif // CHROME_BROWSER_CHROMEOS_FRAME_BROWSER_VIEW_H_ | 112 #endif // CHROME_BROWSER_CHROMEOS_FRAME_BROWSER_VIEW_H_ |
| OLD | NEW |