| 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> |
| 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/search/search_types.h" |
| 20 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" | 21 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" |
| 21 #include "chrome/browser/ui/views/frame/browser_frame.h" | 22 #include "chrome/browser/ui/views/frame/browser_frame.h" |
| 22 #include "chrome/browser/ui/views/unhandled_keyboard_event_handler.h" | 23 #include "chrome/browser/ui/views/unhandled_keyboard_event_handler.h" |
| 23 #include "ui/base/accelerators/accelerator.h" | 24 #include "ui/base/accelerators/accelerator.h" |
| 24 #include "ui/base/models/simple_menu_model.h" | 25 #include "ui/base/models/simple_menu_model.h" |
| 25 #include "ui/gfx/native_widget_types.h" | 26 #include "ui/gfx/native_widget_types.h" |
| 26 #include "ui/gfx/sys_color_change_listener.h" | 27 #include "ui/gfx/sys_color_change_listener.h" |
| 27 #include "ui/views/controls/button/button.h" | 28 #include "ui/views/controls/button/button.h" |
| 28 #include "ui/views/controls/single_split_view_listener.h" | 29 #include "ui/views/controls/single_split_view_listener.h" |
| 29 #include "ui/views/widget/widget_delegate.h" | 30 #include "ui/views/widget/widget_delegate.h" |
| (...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 208 // Restores the focused view. This is also used to set the initial focus | 209 // Restores the focused view. This is also used to set the initial focus |
| 209 // when a new browser window is created. | 210 // when a new browser window is created. |
| 210 void RestoreFocus(); | 211 void RestoreFocus(); |
| 211 | 212 |
| 212 void SetWindowSwitcherButton(views::Button* button); | 213 void SetWindowSwitcherButton(views::Button* button); |
| 213 | 214 |
| 214 // Called from BookmarkBarView/DownloadShelfView during their show/hide | 215 // Called from BookmarkBarView/DownloadShelfView during their show/hide |
| 215 // animations. | 216 // animations. |
| 216 void ToolbarSizeChanged(bool is_animating); | 217 void ToolbarSizeChanged(bool is_animating); |
| 217 | 218 |
| 219 // Returns the toolbar background color. |
| 220 SkColor GetToolbarBackgroundColor(chrome::search::Mode::Type mode); |
| 221 |
| 222 // Returns the toolbar background image. |
| 223 gfx::ImageSkia* GetToolbarBackgroundImage(chrome::search::Mode::Type mode); |
| 224 |
| 218 #if defined(USE_ASH) | 225 #if defined(USE_ASH) |
| 219 BrowserLauncherItemController* launcher_item_controller() const { | 226 BrowserLauncherItemController* launcher_item_controller() const { |
| 220 return launcher_item_controller_.get(); | 227 return launcher_item_controller_.get(); |
| 221 } | 228 } |
| 222 #endif | 229 #endif |
| 223 | 230 |
| 224 // Overridden from BrowserWindow: | 231 // Overridden from BrowserWindow: |
| 225 virtual void Show() OVERRIDE; | 232 virtual void Show() OVERRIDE; |
| 226 virtual void ShowInactive() OVERRIDE; | 233 virtual void ShowInactive() OVERRIDE; |
| 227 virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; | 234 virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; |
| (...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 702 gfx::ScopedSysColorChangeListener color_change_listener_; | 709 gfx::ScopedSysColorChangeListener color_change_listener_; |
| 703 | 710 |
| 704 #if defined(USE_AURA) | 711 #if defined(USE_AURA) |
| 705 scoped_ptr<SearchViewController> search_view_controller_; | 712 scoped_ptr<SearchViewController> search_view_controller_; |
| 706 #endif | 713 #endif |
| 707 | 714 |
| 708 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 715 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
| 709 }; | 716 }; |
| 710 | 717 |
| 711 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 718 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| OLD | NEW |