| 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 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 230 #endif | 230 #endif |
| 231 | 231 |
| 232 // Test support. | 232 // Test support. |
| 233 SearchViewController* search_view_controller() const { | 233 SearchViewController* search_view_controller() const { |
| 234 return search_view_controller_.get(); | 234 return search_view_controller_.get(); |
| 235 } | 235 } |
| 236 | 236 |
| 237 // Overridden from BrowserWindow: | 237 // Overridden from BrowserWindow: |
| 238 virtual void Show() OVERRIDE; | 238 virtual void Show() OVERRIDE; |
| 239 virtual void ShowInactive() OVERRIDE; | 239 virtual void ShowInactive() OVERRIDE; |
| 240 virtual void Hide() OVERRIDE; |
| 240 virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; | 241 virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; |
| 241 virtual void Close() OVERRIDE; | 242 virtual void Close() OVERRIDE; |
| 242 virtual void Activate() OVERRIDE; | 243 virtual void Activate() OVERRIDE; |
| 243 virtual void Deactivate() OVERRIDE; | 244 virtual void Deactivate() OVERRIDE; |
| 244 virtual bool IsActive() const OVERRIDE; | 245 virtual bool IsActive() const OVERRIDE; |
| 245 virtual void FlashFrame(bool flash) OVERRIDE; | 246 virtual void FlashFrame(bool flash) OVERRIDE; |
| 246 virtual bool IsAlwaysOnTop() const OVERRIDE; | 247 virtual bool IsAlwaysOnTop() const OVERRIDE; |
| 247 virtual gfx::NativeWindow GetNativeWindow() OVERRIDE; | 248 virtual gfx::NativeWindow GetNativeWindow() OVERRIDE; |
| 248 virtual BrowserWindowTesting* GetBrowserWindowTesting() OVERRIDE; | 249 virtual BrowserWindowTesting* GetBrowserWindowTesting() OVERRIDE; |
| 249 virtual StatusBubble* GetStatusBubble() OVERRIDE; | 250 virtual StatusBubble* GetStatusBubble() OVERRIDE; |
| (...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 723 scoped_ptr<SearchViewController> search_view_controller_; | 724 scoped_ptr<SearchViewController> search_view_controller_; |
| 724 | 725 |
| 725 scoped_ptr<InstantPreviewControllerViews> preview_controller_; | 726 scoped_ptr<InstantPreviewControllerViews> preview_controller_; |
| 726 | 727 |
| 727 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; | 728 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; |
| 728 | 729 |
| 729 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 730 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
| 730 }; | 731 }; |
| 731 | 732 |
| 732 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 733 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| OLD | NEW |