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

Side by Side Diff: chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.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_bar_view_test.cc ('k') | chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/bookmarks/bookmark_context_menu_controller_vie ws.h"	5 #include "chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_vie ws.h"

6	6

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

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

8 #include "chrome/app/chrome_command_ids.h"	9 #include "chrome/app/chrome_command_ids.h"

9 #include "chrome/browser/bookmarks/bookmark_editor.h"	10 #include "chrome/browser/bookmarks/bookmark_editor.h"

10 #include "chrome/browser/bookmarks/bookmark_model.h"	11 #include "chrome/browser/bookmarks/bookmark_model.h"

11 #include "chrome/browser/bookmarks/bookmark_model_factory.h"	12 #include "chrome/browser/bookmarks/bookmark_model_factory.h"

12 #include "chrome/browser/bookmarks/bookmark_utils.h"	13 #include "chrome/browser/bookmarks/bookmark_utils.h"

13 #include "chrome/browser/prefs/incognito_mode_prefs.h"	14 #include "chrome/browser/prefs/incognito_mode_prefs.h"

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

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

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

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

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

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

20 #include "chrome/common/pref_names.h"	20 #include "chrome/common/pref_names.h"

21 #include "content/public/browser/page_navigator.h"	21 #include "content/public/browser/page_navigator.h"

22 #include "content/public/browser/user_metrics.h"	22 #include "content/public/browser/user_metrics.h"

23 #include "grit/generated_resources.h"	23 #include "grit/generated_resources.h"

24 #include "ui/views/widget/widget.h"	24 #include "ui/views/widget/widget.h"

(...skipping 290 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
315 void BookmarkContextMenuControllerViews::BookmarkModelChanged() {	315 void BookmarkContextMenuControllerViews::BookmarkModelChanged() {

316 delegate_->CloseMenu();	316 delegate_->CloseMenu();

317 }	317 }

318	318

319 BookmarkModel* BookmarkContextMenuControllerViews::RemoveModelObserver() {	319 BookmarkModel* BookmarkContextMenuControllerViews::RemoveModelObserver() {

320 BookmarkModel* model = model_;	320 BookmarkModel* model = model_;

321 model_->RemoveObserver(this);	321 model_->RemoveObserver(this);

322 model_ = NULL;	322 model_ = NULL;

323 return model;	323 return model;

324 }	324 }

OLD	NEW