| 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_BROWSER_H_ |    5 #ifndef CHROME_BROWSER_UI_BROWSER_H_ | 
|    6 #define CHROME_BROWSER_UI_BROWSER_H_ |    6 #define CHROME_BROWSER_UI_BROWSER_H_ | 
|    7  |    7  | 
|    8 #include <map> |    8 #include <map> | 
|    9 #include <set> |    9 #include <set> | 
|   10 #include <string> |   10 #include <string> | 
|   11 #include <vector> |   11 #include <vector> | 
|   12  |   12  | 
|   13 #include "base/basictypes.h" |   13 #include "base/basictypes.h" | 
|   14 #include "base/compiler_specific.h" |   14 #include "base/compiler_specific.h" | 
|   15 #include "base/gtest_prod_util.h" |   15 #include "base/gtest_prod_util.h" | 
|   16 #include "base/memory/scoped_ptr.h" |   16 #include "base/memory/scoped_ptr.h" | 
|   17 #include "base/memory/weak_ptr.h" |   17 #include "base/memory/weak_ptr.h" | 
|   18 #include "base/string16.h" |   18 #include "base/string16.h" | 
 |   19 #include "chrome/browser/api/prefs/pref_change_registrar.h" | 
 |   20 #include "chrome/browser/api/prefs/pref_member.h" | 
|   19 #include "chrome/browser/debugger/devtools_toggle_action.h" |   21 #include "chrome/browser/debugger/devtools_toggle_action.h" | 
|   20 #include "chrome/browser/event_disposition.h" |   22 #include "chrome/browser/event_disposition.h" | 
|   21 #include "chrome/browser/prefs/pref_change_registrar.h" |  | 
|   22 #include "chrome/browser/prefs/pref_member.h" |  | 
|   23 #include "chrome/browser/sessions/session_id.h" |   23 #include "chrome/browser/sessions/session_id.h" | 
|   24 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate.
     h" |   24 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate.
     h" | 
|   25 #include "chrome/browser/ui/bookmarks/bookmark_bar.h" |   25 #include "chrome/browser/ui/bookmarks/bookmark_bar.h" | 
|   26 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h" |   26 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h" | 
|   27 #include "chrome/browser/ui/browser_navigator.h" |   27 #include "chrome/browser/ui/browser_navigator.h" | 
|   28 #include "chrome/browser/ui/constrained_window_tab_helper_delegate.h" |   28 #include "chrome/browser/ui/constrained_window_tab_helper_delegate.h" | 
|   29 #include "chrome/browser/ui/host_desktop.h" |   29 #include "chrome/browser/ui/host_desktop.h" | 
|   30 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h" |   30 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h" | 
|   31 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h" |   31 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h" | 
|   32 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" |   32 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" | 
| (...skipping 890 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  923   bool window_has_shown_; |  923   bool window_has_shown_; | 
|  924  |  924  | 
|  925   // Currently open color chooser. Non-NULL after OpenColorChooser is called and |  925   // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 
|  926   // before DidEndColorChooser is called. |  926   // before DidEndColorChooser is called. | 
|  927   scoped_ptr<content::ColorChooser> color_chooser_; |  927   scoped_ptr<content::ColorChooser> color_chooser_; | 
|  928  |  928  | 
|  929   DISALLOW_COPY_AND_ASSIGN(Browser); |  929   DISALLOW_COPY_AND_ASSIGN(Browser); | 
|  930 }; |  930 }; | 
|  931  |  931  | 
|  932 #endif  // CHROME_BROWSER_UI_BROWSER_H_ |  932 #endif  // CHROME_BROWSER_UI_BROWSER_H_ | 
| OLD | NEW |