chrome/browser/chromeos/offline/offline_load_page.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/chromeos/offline/offline_load_page.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

« chrome/browser/accessibility/accessibility_win_browsertest.cc ('K') | « chrome/browser/chromeos/offline/offline_load_page.h ('k') | chrome/browser/chromeos/options/take_photo_dialog.h » ('j') | content/common/notification_service.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/offline/offline_load_page.cc

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

--- chrome/browser/chromeos/offline/offline_load_page.cc (revision 91880)

+++ chrome/browser/chromeos/offline/offline_load_page.cc (working copy)

@@ -24,8 +24,8 @@

#include "content/browser/tab_contents/navigation_controller.h"

#include "content/browser/tab_contents/navigation_entry.h"

#include "content/browser/tab_contents/tab_contents.h"

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

#include "content/common/notification_service.h"

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

#include "grit/browser_resources.h"

#include "grit/generated_resources.h"

#include "ui/base/l10n/l10n_util.h"

@@ -71,7 +71,7 @@

proceeded_(false),

ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)),

in_test_(false) {

- registrar_.Add(this, NotificationType::NETWORK_STATE_CHANGED,

+ registrar_.Add(this, chrome::NETWORK_STATE_CHANGED,

NotificationService::AllSources());

}

@@ -198,17 +198,17 @@

InterstitialPage::DontProceed();

}

-void OfflineLoadPage::Observe(NotificationType type,

+void OfflineLoadPage::Observe(int type,

const NotificationSource& source,

const NotificationDetails& details) {

- if (type.value == NotificationType::NETWORK_STATE_CHANGED) {

+ if (type == chrome::NETWORK_STATE_CHANGED) {

chromeos::NetworkStateDetails* state_details =

Details<chromeos::NetworkStateDetails>(details).ptr();

DVLOG(1) << "NetworkStateChanaged notification received: state="

<< state_details->state();

if (state_details->state() ==

chromeos::NetworkStateDetails::CONNECTED) {

- registrar_.Remove(this, NotificationType::NETWORK_STATE_CHANGED,

+ registrar_.Remove(this, chrome::NETWORK_STATE_CHANGED,

NotificationService::AllSources());

Proceed();

}