chrome/browser/ui/views/browser_actions_container.cc - Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/.

Side by Side Diff: chrome/browser/ui/views/browser_actions_container.cc

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address review comments, merge to LKGR. Created 7 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc ('k') | chrome/browser/ui/views/chrome_views_delegate.cc » ('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 #include "chrome/browser/ui/views/browser_actions_container.h"	5 #include "chrome/browser/ui/views/browser_actions_container.h"

6	6

7 #include "base/compiler_specific.h"	7 #include "base/compiler_specific.h"

	8 #include "base/prefs/pref_service.h"

8 #include "base/stl_util.h"	9 #include "base/stl_util.h"

9 #include "chrome/browser/extensions/extension_service.h"	10 #include "chrome/browser/extensions/extension_service.h"

10 #include "chrome/browser/extensions/extension_system.h"	11 #include "chrome/browser/extensions/extension_system.h"

11 #include "chrome/browser/extensions/tab_helper.h"	12 #include "chrome/browser/extensions/tab_helper.h"

12 #include "chrome/browser/prefs/pref_registry_syncable.h"	13 #include "chrome/browser/prefs/pref_registry_syncable.h"

13 #include "chrome/browser/prefs/pref_service.h"

14 #include "chrome/browser/profiles/profile.h"	14 #include "chrome/browser/profiles/profile.h"

15 #include "chrome/browser/sessions/session_tab_helper.h"	15 #include "chrome/browser/sessions/session_tab_helper.h"

16 #include "chrome/browser/ui/browser.h"	16 #include "chrome/browser/ui/browser.h"

17 #include "chrome/browser/ui/tabs/tab_strip_model.h"	17 #include "chrome/browser/ui/tabs/tab_strip_model.h"

18 #include "chrome/browser/ui/view_ids.h"	18 #include "chrome/browser/ui/view_ids.h"

19 #include "chrome/browser/ui/views/browser_action_view.h"	19 #include "chrome/browser/ui/views/browser_action_view.h"

20 #include "chrome/browser/ui/views/extensions/browser_action_drag_data.h"	20 #include "chrome/browser/ui/views/extensions/browser_action_drag_data.h"

21 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views .h"	21 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views .h"

22 #include "chrome/browser/ui/views/extensions/extension_popup.h"	22 #include "chrome/browser/ui/views/extensions/extension_popup.h"

23 #include "chrome/browser/ui/views/toolbar_view.h"	23 #include "chrome/browser/ui/views/toolbar_view.h"

(...skipping 830 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
854 views::BubbleBorder::TOP_LEFT : views::BubbleBorder::TOP_RIGHT;	854 views::BubbleBorder::TOP_LEFT : views::BubbleBorder::TOP_RIGHT;

855 popup_ = ExtensionPopup::ShowPopup(popup_url,	855 popup_ = ExtensionPopup::ShowPopup(popup_url,

856 browser_,	856 browser_,

857 reference_view,	857 reference_view,

858 arrow_location,	858 arrow_location,

859 show_action);	859 show_action);

860 popup_->GetWidget()->AddObserver(this);	860 popup_->GetWidget()->AddObserver(this);

861 popup_button_ = button;	861 popup_button_ = button;

862 popup_button_->SetButtonPushed();	862 popup_button_->SetButtonPushed();

863 }	863 }

OLD	NEW