Chromium Code Reviews| 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 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 406 // views::SingleSplitViewListener overrides: | 406 // views::SingleSplitViewListener overrides: |
| 407 virtual bool SplitHandleMoved(views::SingleSplitView* sender) OVERRIDE; | 407 virtual bool SplitHandleMoved(views::SingleSplitView* sender) OVERRIDE; |
| 408 | 408 |
| 409 // gfx::ScopedSysColorChangeListener overrides: | 409 // gfx::ScopedSysColorChangeListener overrides: |
| 410 virtual void OnSysColorChange() OVERRIDE; | 410 virtual void OnSysColorChange() OVERRIDE; |
| 411 | 411 |
| 412 // Returns the resource ID to use for the OTR icon, which depends on | 412 // Returns the resource ID to use for the OTR icon, which depends on |
| 413 // which layout is being shown and whether we are full-screen. | 413 // which layout is being shown and whether we are full-screen. |
| 414 int GetOTRIconResourceID() const; | 414 int GetOTRIconResourceID() const; |
| 415 | 415 |
| 416 views::Button* window_switcher_button() { | |
|
sky
2012/08/22 13:51:48
Move this beneath the setter.
| |
| 417 return window_switcher_button_; | |
| 418 } | |
| 419 | |
| 416 protected: | 420 protected: |
| 417 // Appends to |toolbars| a pointer to each AccessiblePaneView that | 421 // Appends to |toolbars| a pointer to each AccessiblePaneView that |
| 418 // can be traversed using F6, in the order they should be traversed. | 422 // can be traversed using F6, in the order they should be traversed. |
| 419 // Abstracted here so that it can be extended for Chrome OS. | 423 // Abstracted here so that it can be extended for Chrome OS. |
| 420 virtual void GetAccessiblePanes( | 424 virtual void GetAccessiblePanes( |
| 421 std::vector<views::AccessiblePaneView*>* panes); | 425 std::vector<views::AccessiblePaneView*>* panes); |
| 422 | 426 |
| 423 int last_focused_view_storage_id() const { | 427 int last_focused_view_storage_id() const { |
| 424 return last_focused_view_storage_id_; | 428 return last_focused_view_storage_id_; |
| 425 } | 429 } |
| (...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 713 #if defined(USE_AURA) | 717 #if defined(USE_AURA) |
| 714 scoped_ptr<SearchViewController> search_view_controller_; | 718 scoped_ptr<SearchViewController> search_view_controller_; |
| 715 #endif | 719 #endif |
| 716 | 720 |
| 717 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; | 721 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; |
| 718 | 722 |
| 719 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 723 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
| 720 }; | 724 }; |
| 721 | 725 |
| 722 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 726 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| OLD | NEW |