Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(884)

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.h

Issue 10388156: Adding the flip windows button to the browser window (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "base/timer.h" 15 #include "base/timer.h"
16 #include "build/build_config.h" 16 #include "build/build_config.h"
17 #include "chrome/browser/infobars/infobar_container.h" 17 #include "chrome/browser/infobars/infobar_container.h"
18 #include "chrome/browser/ui/browser.h" 18 #include "chrome/browser/ui/browser.h"
19 #include "chrome/browser/ui/browser_window.h" 19 #include "chrome/browser/ui/browser_window.h"
20 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" 20 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
21 #include "chrome/browser/ui/views/frame/browser_frame.h" 21 #include "chrome/browser/ui/views/frame/browser_frame.h"
22 #include "chrome/browser/ui/views/unhandled_keyboard_event_handler.h" 22 #include "chrome/browser/ui/views/unhandled_keyboard_event_handler.h"
23 #include "ui/base/accelerators/accelerator.h" 23 #include "ui/base/accelerators/accelerator.h"
24 #include "ui/base/models/simple_menu_model.h" 24 #include "ui/base/models/simple_menu_model.h"
25 #include "ui/gfx/native_widget_types.h" 25 #include "ui/gfx/native_widget_types.h"
26 #include "ui/gfx/sys_color_change_listener.h" 26 #include "ui/gfx/sys_color_change_listener.h"
27 #include "ui/views/controls/button/button.h"
27 #include "ui/views/controls/single_split_view_listener.h" 28 #include "ui/views/controls/single_split_view_listener.h"
28 #include "ui/views/widget/widget_delegate.h" 29 #include "ui/views/widget/widget_delegate.h"
29 #include "ui/views/window/client_view.h" 30 #include "ui/views/window/client_view.h"
30 31
31 #if defined(OS_WIN) 32 #if defined(OS_WIN)
32 #include "chrome/browser/hang_monitor/hung_plugin_action.h" 33 #include "chrome/browser/hang_monitor/hung_plugin_action.h"
33 #include "chrome/browser/hang_monitor/hung_window_detector.h" 34 #include "chrome/browser/hang_monitor/hung_window_detector.h"
34 #endif 35 #endif
35 36
36 // NOTE: For more information about the objects and files in this directory, 37 // NOTE: For more information about the objects and files in this directory,
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 virtual bool IsFullscreenBubbleVisible() const OVERRIDE; 194 virtual bool IsFullscreenBubbleVisible() const OVERRIDE;
194 195
195 // Invoked from the frame when the full screen state changes. This is only 196 // Invoked from the frame when the full screen state changes. This is only
196 // used on Linux. 197 // used on Linux.
197 void FullScreenStateChanged(); 198 void FullScreenStateChanged();
198 199
199 // Restores the focused view. This is also used to set the initial focus 200 // Restores the focused view. This is also used to set the initial focus
200 // when a new browser window is created. 201 // when a new browser window is created.
201 void RestoreFocus(); 202 void RestoreFocus();
202 203
204 void SetWindowSwitcherButton(views::Button* button);
205
203 #if defined(USE_ASH) 206 #if defined(USE_ASH)
204 BrowserLauncherItemController* launcher_item_controller() const { 207 BrowserLauncherItemController* launcher_item_controller() const {
205 return launcher_item_controller_.get(); 208 return launcher_item_controller_.get();
206 } 209 }
207 #endif 210 #endif
208 211
209 // Overridden from BrowserWindow: 212 // Overridden from BrowserWindow:
210 virtual void Show() OVERRIDE; 213 virtual void Show() OVERRIDE;
211 virtual void ShowInactive() OVERRIDE; 214 virtual void ShowInactive() OVERRIDE;
212 virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; 215 virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE;
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after
573 // active_bookmark_bar_ is either NULL, if the bookmark bar isn't showing, 576 // active_bookmark_bar_ is either NULL, if the bookmark bar isn't showing,
574 // or is bookmark_bar_view_ if the bookmark bar is showing. 577 // or is bookmark_bar_view_ if the bookmark bar is showing.
575 views::View* active_bookmark_bar_; 578 views::View* active_bookmark_bar_;
576 579
577 // The TabStrip. 580 // The TabStrip.
578 TabStrip* tabstrip_; 581 TabStrip* tabstrip_;
579 582
580 // The Toolbar containing the navigation buttons, menus and the address bar. 583 // The Toolbar containing the navigation buttons, menus and the address bar.
581 ToolbarView* toolbar_; 584 ToolbarView* toolbar_;
582 585
586 // This button sits next to the tabs on the right hand side and it is used
587 // only in windows metro metro mode to allow the user to flip among browser
588 // windows.
589 views::Button* window_switcher_button_;
590
583 // The Bookmark Bar View for this window. Lazily created. 591 // The Bookmark Bar View for this window. Lazily created.
584 scoped_ptr<BookmarkBarView> bookmark_bar_view_; 592 scoped_ptr<BookmarkBarView> bookmark_bar_view_;
585 593
586 // The download shelf view (view at the bottom of the page). 594 // The download shelf view (view at the bottom of the page).
587 scoped_ptr<DownloadShelfView> download_shelf_; 595 scoped_ptr<DownloadShelfView> download_shelf_;
588 596
589 // The InfoBarContainerView that contains InfoBars for the current tab. 597 // The InfoBarContainerView that contains InfoBars for the current tab.
590 InfoBarContainerView* infobar_container_; 598 InfoBarContainerView* infobar_container_;
591 599
592 // The view that contains the selected WebContents. 600 // The view that contains the selected WebContents.
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
662 bool force_location_bar_focus_; 670 bool force_location_bar_focus_;
663 671
664 PendingFullscreenRequest fullscreen_request_; 672 PendingFullscreenRequest fullscreen_request_;
665 673
666 gfx::ScopedSysColorChangeListener color_change_listener_; 674 gfx::ScopedSysColorChangeListener color_change_listener_;
667 675
668 DISALLOW_COPY_AND_ASSIGN(BrowserView); 676 DISALLOW_COPY_AND_ASSIGN(BrowserView);
669 }; 677 };
670 678
671 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 679 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/browser_frame_win.cc ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698