| 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 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 236 #if defined(USE_AURA) | 236 #if defined(USE_AURA) |
| 237 // Test support. | 237 // Test support. |
| 238 SearchViewController* search_view_controller() const { | 238 SearchViewController* search_view_controller() const { |
| 239 return search_view_controller_.get(); | 239 return search_view_controller_.get(); |
| 240 } | 240 } |
| 241 #endif | 241 #endif |
| 242 | 242 |
| 243 // Overridden from BrowserWindow: | 243 // Overridden from BrowserWindow: |
| 244 virtual void Show() OVERRIDE; | 244 virtual void Show() OVERRIDE; |
| 245 virtual void ShowInactive() OVERRIDE; | 245 virtual void ShowInactive() OVERRIDE; |
| 246 virtual void Hide() OVERRIDE; |
| 246 virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; | 247 virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; |
| 247 virtual void Close() OVERRIDE; | 248 virtual void Close() OVERRIDE; |
| 248 virtual void Activate() OVERRIDE; | 249 virtual void Activate() OVERRIDE; |
| 249 virtual void Deactivate() OVERRIDE; | 250 virtual void Deactivate() OVERRIDE; |
| 250 virtual bool IsActive() const OVERRIDE; | 251 virtual bool IsActive() const OVERRIDE; |
| 251 virtual void FlashFrame(bool flash) OVERRIDE; | 252 virtual void FlashFrame(bool flash) OVERRIDE; |
| 252 virtual bool IsAlwaysOnTop() const OVERRIDE; | 253 virtual bool IsAlwaysOnTop() const OVERRIDE; |
| 253 virtual gfx::NativeWindow GetNativeWindow() OVERRIDE; | 254 virtual gfx::NativeWindow GetNativeWindow() OVERRIDE; |
| 254 virtual BrowserWindowTesting* GetBrowserWindowTesting() OVERRIDE; | 255 virtual BrowserWindowTesting* GetBrowserWindowTesting() OVERRIDE; |
| 255 virtual StatusBubble* GetStatusBubble() OVERRIDE; | 256 virtual StatusBubble* GetStatusBubble() OVERRIDE; |
| (...skipping 475 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 731 #if defined(USE_AURA) | 732 #if defined(USE_AURA) |
| 732 scoped_ptr<SearchViewController> search_view_controller_; | 733 scoped_ptr<SearchViewController> search_view_controller_; |
| 733 #endif | 734 #endif |
| 734 | 735 |
| 735 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; | 736 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; |
| 736 | 737 |
| 737 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 738 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
| 738 }; | 739 }; |
| 739 | 740 |
| 740 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 741 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| OLD | NEW |