chrome/browser/ui/webui/options/core_options_handler.cc - Issue 7327007: Moving notification types which are chrome specific to a new header file chrome_notification_type...

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

Unified Diff: chrome/browser/ui/webui/options/core_options_handler.cc

Issue 7327007: Moving notification types which are chrome specific to a new header file chrome_notification_type... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 9 years, 5 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/webui/options/core_options_handler.h ('k') | chrome/browser/ui/webui/options/extension_settings_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/core_options_handler.cc

===================================================================

--- chrome/browser/ui/webui/options/core_options_handler.cc (revision 91968)

+++ chrome/browser/ui/webui/options/core_options_handler.cc (working copy)

@@ -14,11 +14,12 @@

#include "chrome/browser/google/google_util.h"

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

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

+#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/pref_names.h"

#include "chrome/common/url_constants.h"

#include "content/browser/user_metrics.h"

+#include "content/common/content_notification_types.h"

#include "content/common/notification_details.h"

-#include "content/common/notification_type.h"

#include "googleurl/src/gurl.h"

#include "grit/chromium_strings.h"

#include "grit/generated_resources.h"

@@ -95,10 +96,10 @@

return result;

}

-void CoreOptionsHandler::Observe(NotificationType type,

+void CoreOptionsHandler::Observe(int type,

const NotificationSource& source,

const NotificationDetails& details) {

- if (type == NotificationType::PREF_CHANGED)

+ if (type == chrome::NOTIFICATION_PREF_CHANGED)

NotifyPrefChanged(Details<std::string>(details).ptr());

}