chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc - Issue 11896047: Move the methods in disposition_utils.h and event_disposition.h to ui\base\window_open_disposition.…

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc

Issue 11896047: Move the methods in disposition_utils.h and event_disposition.h to ui\base\window_open_disposition.… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: fix regex in ui.gyp Created 7 years, 11 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

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

6	6

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

8 #include "base/utf_string_conversions.h"	8 #include "base/utf_string_conversions.h"

9 #include "chrome/browser/bookmarks/bookmark_model.h"	9 #include "chrome/browser/bookmarks/bookmark_model.h"

10 #include "chrome/browser/bookmarks/bookmark_model_factory.h"	10 #include "chrome/browser/bookmarks/bookmark_model_factory.h"

11 #include "chrome/browser/bookmarks/bookmark_node_data.h"	11 #include "chrome/browser/bookmarks/bookmark_node_data.h"

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

13 #include "chrome/browser/event_disposition.h"

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

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

16 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"	15 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"

17 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h"	16 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h"

18 #include "chrome/common/pref_names.h"	17 #include "chrome/common/pref_names.h"

19 #include "content/public/browser/page_navigator.h"	18 #include "content/public/browser/page_navigator.h"

20 #include "content/public/browser/user_metrics.h"	19 #include "content/public/browser/user_metrics.h"

21 #include "grit/generated_resources.h"	20 #include "grit/generated_resources.h"

22 #include "grit/theme_resources.h"	21 #include "grit/theme_resources.h"

23 #include "grit/ui_resources.h"	22 #include "grit/ui_resources.h"

(...skipping 169 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
193 if (!menu_delegate_->is_mutating_model())	192 if (!menu_delegate_->is_mutating_model())

194 menu()->Cancel();	193 menu()->Cancel();

195 }	194 }

196	195

197 BookmarkMenuController::~BookmarkMenuController() {	196 BookmarkMenuController::~BookmarkMenuController() {

198 BookmarkModelFactory::GetForProfile(	197 BookmarkModelFactory::GetForProfile(

199 menu_delegate_->profile())->RemoveObserver(this);	198 menu_delegate_->profile())->RemoveObserver(this);

200 if (observer_)	199 if (observer_)

201 observer_->BookmarkMenuDeleted(this);	200 observer_->BookmarkMenuDeleted(this);

202 }	201 }

OLD	NEW