| OLD | NEW |
| 1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2009 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_VIEWS_FRAME_BROWSER_VIEW_H_ | 5 #ifndef CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_ |
| 6 #define CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_ | 6 #define CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 272 virtual void ContinueDraggingDetachedTab(const gfx::Rect& tab_bounds); | 272 virtual void ContinueDraggingDetachedTab(const gfx::Rect& tab_bounds); |
| 273 virtual void UserChangedTheme(); | 273 virtual void UserChangedTheme(); |
| 274 virtual int GetExtraRenderViewHeight() const; | 274 virtual int GetExtraRenderViewHeight() const; |
| 275 virtual void TabContentsFocused(TabContents* source); | 275 virtual void TabContentsFocused(TabContents* source); |
| 276 virtual void ShowPageInfo(Profile* profile, | 276 virtual void ShowPageInfo(Profile* profile, |
| 277 const GURL& url, | 277 const GURL& url, |
| 278 const NavigationEntry::SSLStatus& ssl, | 278 const NavigationEntry::SSLStatus& ssl, |
| 279 bool show_history); | 279 bool show_history); |
| 280 virtual void ShowAppMenu(); | 280 virtual void ShowAppMenu(); |
| 281 virtual void ShowPageMenu(); | 281 virtual void ShowPageMenu(); |
| 282 virtual int GetCommandId(const NativeWebKeyboardEvent& event); | 282 virtual bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event, |
| 283 bool* is_keyboard_shortcut); |
| 284 virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event); |
| 283 virtual void ShowCreateShortcutsDialog(TabContents* tab_contents); | 285 virtual void ShowCreateShortcutsDialog(TabContents* tab_contents); |
| 284 #if defined(TOOLKIT_VIEWS) | 286 #if defined(TOOLKIT_VIEWS) |
| 285 virtual void ToggleCompactNavigationBar(); | 287 virtual void ToggleCompactNavigationBar(); |
| 286 #endif // defined(TOOLKIT_VIEWS) | 288 #endif // defined(TOOLKIT_VIEWS) |
| 287 | 289 |
| 288 // Overridden from BrowserWindowTesting: | 290 // Overridden from BrowserWindowTesting: |
| 289 virtual BookmarkBarView* GetBookmarkBarView() const; | 291 virtual BookmarkBarView* GetBookmarkBarView() const; |
| 290 virtual LocationBarView* GetLocationBarView() const; | 292 virtual LocationBarView* GetLocationBarView() const; |
| 291 virtual views::View* GetTabContentsContainerView() const; | 293 virtual views::View* GetTabContentsContainerView() const; |
| 292 virtual ToolbarView* GetToolbarView() const; | 294 virtual ToolbarView* GetToolbarView() const; |
| (...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 540 | 542 |
| 541 scoped_ptr<BrowserExtender> browser_extender_; | 543 scoped_ptr<BrowserExtender> browser_extender_; |
| 542 | 544 |
| 543 // Last focused view that issued a tab traversal. | 545 // Last focused view that issued a tab traversal. |
| 544 int last_focused_view_storage_id_; | 546 int last_focused_view_storage_id_; |
| 545 | 547 |
| 546 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 548 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
| 547 }; | 549 }; |
| 548 | 550 |
| 549 #endif // CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_ | 551 #endif // CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_ |
| OLD | NEW |