chrome/browser/ui/browser.h - Issue 12789006: base/prefs: Remove the public/ directory and move the files to //base/prefs.

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

Issue 12789006: base/prefs: Remove the public/ directory and move the files to //base/prefs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 9 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/autofill/autofill_dialog_models.h ('k') | chrome/browser/ui/browser_command_controller.h » ('j') | no next file with comments »

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/prefs/public/pref_change_registrar.h"	18 #include "base/prefs/pref_change_registrar.h"

19 #include "base/prefs/public/pref_member.h"	19 #include "base/prefs/pref_member.h"

20 #include "base/string16.h"	20 #include "base/string16.h"

21 #include "chrome/browser/devtools/devtools_toggle_action.h"	21 #include "chrome/browser/devtools/devtools_toggle_action.h"

22 #include "chrome/browser/sessions/session_id.h"	22 #include "chrome/browser/sessions/session_id.h"

23 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate. h"	23 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate. h"

24 #include "chrome/browser/ui/bookmarks/bookmark_bar.h"	24 #include "chrome/browser/ui/bookmarks/bookmark_bar.h"

25 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h"	25 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h"

26 #include "chrome/browser/ui/browser_navigator.h"	26 #include "chrome/browser/ui/browser_navigator.h"

27 #include "chrome/browser/ui/host_desktop.h"	27 #include "chrome/browser/ui/host_desktop.h"

28 #include "chrome/browser/ui/search/search_model_observer.h"	28 #include "chrome/browser/ui/search/search_model_observer.h"

29 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h"	29 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h"

(...skipping 891 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
921 bool window_has_shown_;	921 bool window_has_shown_;

922	922

923 // Currently open color chooser. Non-NULL after OpenColorChooser is called and	923 // Currently open color chooser. Non-NULL after OpenColorChooser is called and

924 // before DidEndColorChooser is called.	924 // before DidEndColorChooser is called.

925 scoped_ptr<content::ColorChooser> color_chooser_;	925 scoped_ptr<content::ColorChooser> color_chooser_;

926	926

927 DISALLOW_COPY_AND_ASSIGN(Browser);	927 DISALLOW_COPY_AND_ASSIGN(Browser);

928 };	928 };

929	929

930 #endif // CHROME_BROWSER_UI_BROWSER_H_	930 #endif // CHROME_BROWSER_UI_BROWSER_H_

OLD	NEW