| OLD | NEW | 
|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/scoped_ptr.h" | 13 #include "base/scoped_ptr.h" | 
| 14 #include "base/timer.h" | 14 #include "base/timer.h" | 
| 15 #include "build/build_config.h" | 15 #include "build/build_config.h" | 
| 16 #include "chrome/browser/browser_window.h" | 16 #include "chrome/browser/browser_window.h" | 
| 17 #include "chrome/browser/tabs/tab_strip_model_observer.h" | 17 #include "chrome/browser/tabs/tab_strip_model_observer.h" | 
| 18 #include "chrome/browser/ui/browser.h" | 18 #include "chrome/browser/ui/browser.h" | 
| 19 #include "chrome/browser/ui/views/frame/browser_bubble_host.h" | 19 #include "chrome/browser/ui/views/frame/browser_bubble_host.h" | 
| 20 #include "chrome/browser/ui/views/frame/browser_frame.h" | 20 #include "chrome/browser/ui/views/frame/browser_frame.h" | 
| 21 #include "chrome/browser/ui/views/infobars/infobar_container.h" | 21 #include "chrome/browser/ui/views/infobars/infobar_container.h" | 
| 22 #include "chrome/browser/ui/views/tab_contents/tab_contents_container.h" | 22 #include "chrome/browser/ui/views/tab_contents/tab_contents_container.h" | 
|  | 23 #include "chrome/browser/ui/views/tabs/base_tab_strip.h" | 
| 23 #include "chrome/browser/ui/views/tabs/tab_strip.h" | 24 #include "chrome/browser/ui/views/tabs/tab_strip.h" | 
| 24 #include "chrome/browser/ui/views/tabs/base_tab_strip.h" |  | 
| 25 #include "chrome/browser/ui/views/unhandled_keyboard_event_handler.h" | 25 #include "chrome/browser/ui/views/unhandled_keyboard_event_handler.h" | 
| 26 #include "chrome/common/notification_registrar.h" | 26 #include "chrome/common/notification_registrar.h" | 
| 27 #include "gfx/native_widget_types.h" | 27 #include "gfx/native_widget_types.h" | 
| 28 #include "ui/base/models/simple_menu_model.h" | 28 #include "ui/base/models/simple_menu_model.h" | 
| 29 #include "views/controls/single_split_view.h" | 29 #include "views/controls/single_split_view.h" | 
| 30 #include "views/window/client_view.h" | 30 #include "views/window/client_view.h" | 
| 31 #include "views/window/window_delegate.h" | 31 #include "views/window/window_delegate.h" | 
| 32 | 32 | 
| 33 #if defined(OS_WIN) | 33 #if defined(OS_WIN) | 
| 34 #include "chrome/browser/hang_monitor/hung_plugin_action.h" | 34 #include "chrome/browser/hang_monitor/hung_plugin_action.h" | 
| (...skipping 636 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 671   UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_; | 671   UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_; | 
| 672 | 672 | 
| 673   scoped_ptr<AccessibleViewHelper> accessible_view_helper_; | 673   scoped_ptr<AccessibleViewHelper> accessible_view_helper_; | 
| 674 | 674 | 
| 675   NotificationRegistrar registrar_; | 675   NotificationRegistrar registrar_; | 
| 676 | 676 | 
| 677   DISALLOW_COPY_AND_ASSIGN(BrowserView); | 677   DISALLOW_COPY_AND_ASSIGN(BrowserView); | 
| 678 }; | 678 }; | 
| 679 | 679 | 
| 680 #endif  // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 680 #endif  // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 
| OLD | NEW | 
|---|