Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(526)

Side by Side Diff: chrome/browser/ui/browser.h

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/ui/bookmarks/bookmark_utils_desktop.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
11 #include <set> 11 #include <set>
12 #include <string> 12 #include <string>
13 #include <vector> 13 #include <vector>
14 14
15 #include "base/compiler_specific.h" 15 #include "base/compiler_specific.h"
16 #include "base/gtest_prod_util.h" 16 #include "base/gtest_prod_util.h"
17 #include "base/macros.h" 17 #include "base/macros.h"
18 #include "base/memory/scoped_ptr.h" 18 #include "base/memory/scoped_ptr.h"
19 #include "base/memory/weak_ptr.h" 19 #include "base/memory/weak_ptr.h"
20 #include "base/prefs/pref_change_registrar.h"
21 #include "base/prefs/pref_member.h"
22 #include "base/scoped_observer.h" 20 #include "base/scoped_observer.h"
23 #include "base/strings/string16.h" 21 #include "base/strings/string16.h"
24 #include "build/build_config.h" 22 #include "build/build_config.h"
25 #include "chrome/browser/devtools/devtools_toggle_action.h" 23 #include "chrome/browser/devtools/devtools_toggle_action.h"
26 #include "chrome/browser/ui/bookmarks/bookmark_bar.h" 24 #include "chrome/browser/ui/bookmarks/bookmark_bar.h"
27 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h" 25 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h"
28 #include "chrome/browser/ui/browser_navigator.h" 26 #include "chrome/browser/ui/browser_navigator.h"
29 #include "chrome/browser/ui/chrome_bubble_manager.h" 27 #include "chrome/browser/ui/chrome_bubble_manager.h"
30 #include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h" 28 #include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h"
31 #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h" 29 #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h"
32 #include "chrome/browser/ui/host_desktop.h" 30 #include "chrome/browser/ui/host_desktop.h"
33 #include "chrome/browser/ui/search/search_tab_helper_delegate.h" 31 #include "chrome/browser/ui/search/search_tab_helper_delegate.h"
34 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h" 32 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h"
35 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h" 33 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h"
36 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" 34 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
37 #include "components/content_settings/core/common/content_settings.h" 35 #include "components/content_settings/core/common/content_settings.h"
38 #include "components/content_settings/core/common/content_settings_types.h" 36 #include "components/content_settings/core/common/content_settings_types.h"
37 #include "components/prefs/pref_change_registrar.h"
38 #include "components/prefs/pref_member.h"
39 #include "components/sessions/core/session_id.h" 39 #include "components/sessions/core/session_id.h"
40 #include "components/toolbar/toolbar_model.h" 40 #include "components/toolbar/toolbar_model.h"
41 #include "components/translate/content/browser/content_translate_driver.h" 41 #include "components/translate/content/browser/content_translate_driver.h"
42 #include "components/ui/zoom/zoom_observer.h" 42 #include "components/ui/zoom/zoom_observer.h"
43 #include "content/public/browser/notification_observer.h" 43 #include "content/public/browser/notification_observer.h"
44 #include "content/public/browser/notification_registrar.h" 44 #include "content/public/browser/notification_registrar.h"
45 #include "content/public/browser/page_navigator.h" 45 #include "content/public/browser/page_navigator.h"
46 #include "content/public/browser/web_contents_delegate.h" 46 #include "content/public/browser/web_contents_delegate.h"
47 #include "content/public/common/page_zoom.h" 47 #include "content/public/common/page_zoom.h"
48 #include "ui/base/page_transition_types.h" 48 #include "ui/base/page_transition_types.h"
(...skipping 946 matching lines...) Expand 10 before | Expand all | Expand 10 after
995 // The following factory is used for chrome update coalescing. 995 // The following factory is used for chrome update coalescing.
996 base::WeakPtrFactory<Browser> chrome_updater_factory_; 996 base::WeakPtrFactory<Browser> chrome_updater_factory_;
997 997
998 // The following factory is used to close the frame at a later time. 998 // The following factory is used to close the frame at a later time.
999 base::WeakPtrFactory<Browser> weak_factory_; 999 base::WeakPtrFactory<Browser> weak_factory_;
1000 1000
1001 DISALLOW_COPY_AND_ASSIGN(Browser); 1001 DISALLOW_COPY_AND_ASSIGN(Browser);
1002 }; 1002 };
1003 1003
1004 #endif // CHROME_BROWSER_UI_BROWSER_H_ 1004 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/bookmarks/bookmark_utils_desktop.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698