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> |
11 | 11 |
12 #include "base/compiler_specific.h" | 12 #include "base/compiler_specific.h" |
13 #include "base/gtest_prod_util.h" | 13 #include "base/gtest_prod_util.h" |
| 14 #include "base/macros.h" |
14 #include "base/memory/scoped_ptr.h" | 15 #include "base/memory/scoped_ptr.h" |
15 #include "base/timer/timer.h" | 16 #include "base/timer/timer.h" |
16 #include "build/build_config.h" | 17 #include "build/build_config.h" |
17 #include "chrome/browser/devtools/devtools_window.h" | 18 #include "chrome/browser/devtools/devtools_window.h" |
18 #include "chrome/browser/ui/browser.h" | 19 #include "chrome/browser/ui/browser.h" |
19 #include "chrome/browser/ui/browser_window.h" | 20 #include "chrome/browser/ui/browser_window.h" |
20 #include "chrome/browser/ui/exclusive_access/exclusive_access_context.h" | 21 #include "chrome/browser/ui/exclusive_access/exclusive_access_context.h" |
21 #include "chrome/browser/ui/infobar_container_delegate.h" | 22 #include "chrome/browser/ui/infobar_container_delegate.h" |
22 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" | 23 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" |
23 #include "chrome/browser/ui/views/exclusive_access_bubble_views_context.h" | 24 #include "chrome/browser/ui/views/exclusive_access_bubble_views_context.h" |
(...skipping 688 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
712 scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_; | 713 scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_; |
713 | 714 |
714 SigninViewController signin_view_controller_; | 715 SigninViewController signin_view_controller_; |
715 | 716 |
716 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; | 717 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; |
717 | 718 |
718 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 719 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
719 }; | 720 }; |
720 | 721 |
721 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 722 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
OLD | NEW |