| 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 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <map> | 9 #include <map> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 524 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 535 void UpdateAcceleratorMetrics(const ui::Accelerator& accelerator, | 535 void UpdateAcceleratorMetrics(const ui::Accelerator& accelerator, |
| 536 int command_id); | 536 int command_id); |
| 537 | 537 |
| 538 // Invoked from ActiveTabChanged or when instant is made active. | 538 // Invoked from ActiveTabChanged or when instant is made active. |
| 539 // |new_contents| must not be NULL. | 539 // |new_contents| must not be NULL. |
| 540 void ProcessTabSelected(TabContents* new_contents); | 540 void ProcessTabSelected(TabContents* new_contents); |
| 541 | 541 |
| 542 // Exposes resize corner size to BrowserViewLayout. | 542 // Exposes resize corner size to BrowserViewLayout. |
| 543 gfx::Size GetResizeCornerSize() const; | 543 gfx::Size GetResizeCornerSize() const; |
| 544 | 544 |
| 545 // Shows the about chrome modal dialog and returns the Window object. | |
| 546 views::Widget* DoShowAboutChromeDialog(); | |
| 547 | |
| 548 // Set the value of |toolbar_| and hook it into the views hierarchy | 545 // Set the value of |toolbar_| and hook it into the views hierarchy |
| 549 void SetToolbar(ToolbarView* toolbar); | 546 void SetToolbar(ToolbarView* toolbar); |
| 550 | 547 |
| 551 // Create an icon for this window in the launcher (currently only for Ash). | 548 // Create an icon for this window in the launcher (currently only for Ash). |
| 552 void CreateLauncherIcon(); | 549 void CreateLauncherIcon(); |
| 553 | 550 |
| 554 // Last focused view that issued a tab traversal. | 551 // Last focused view that issued a tab traversal. |
| 555 int last_focused_view_storage_id_; | 552 int last_focused_view_storage_id_; |
| 556 | 553 |
| 557 // The BrowserFrame that hosts this view. | 554 // The BrowserFrame that hosts this view. |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 697 bool force_location_bar_focus_; | 694 bool force_location_bar_focus_; |
| 698 | 695 |
| 699 PendingFullscreenRequest fullscreen_request_; | 696 PendingFullscreenRequest fullscreen_request_; |
| 700 | 697 |
| 701 gfx::ScopedSysColorChangeListener color_change_listener_; | 698 gfx::ScopedSysColorChangeListener color_change_listener_; |
| 702 | 699 |
| 703 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 700 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
| 704 }; | 701 }; |
| 705 | 702 |
| 706 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 703 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| OLD | NEW |