Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(285)

Side by Side Diff: chrome/browser/sync/sync_error_notifier_ash.cc

Issue 580243004: Remove unnecessary image downloading handler of notifications. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: build fix of desktop linux/win Created 6 years, 2 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/sync/sync_error_notifier_ash.h" 5 #include "chrome/browser/sync/sync_error_notifier_ash.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_delegate.h" 8 #include "ash/shell_delegate.h"
9 #include "ash/system/system_notifier.h" 9 #include "ash/system/system_notifier.h"
10 #include "base/strings/string16.h" 10 #include "base/strings/string16.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 Profile* profile); 45 Profile* profile);
46 46
47 // NotificationDelegate: 47 // NotificationDelegate:
48 virtual void Display() override; 48 virtual void Display() override;
49 virtual void Error() override; 49 virtual void Error() override;
50 virtual void Close(bool by_user) override; 50 virtual void Close(bool by_user) override;
51 virtual bool HasClickedListener() override; 51 virtual bool HasClickedListener() override;
52 virtual void Click() override; 52 virtual void Click() override;
53 virtual void ButtonClick(int button_index) override; 53 virtual void ButtonClick(int button_index) override;
54 virtual std::string id() const override; 54 virtual std::string id() const override;
55 virtual content::WebContents* GetWebContents() const override;
56 55
57 protected: 56 protected:
58 virtual ~SyncNotificationDelegate(); 57 virtual ~SyncNotificationDelegate();
59 58
60 private: 59 private:
61 void ShowSyncSetup(); 60 void ShowSyncSetup();
62 61
63 // Unique id of the notification. 62 // Unique id of the notification.
64 const std::string id_; 63 const std::string id_;
65 64
(...skipping 30 matching lines...) Expand all
96 } 95 }
97 96
98 void SyncNotificationDelegate::ButtonClick(int button_index) { 97 void SyncNotificationDelegate::ButtonClick(int button_index) {
99 ShowSyncSetup(); 98 ShowSyncSetup();
100 } 99 }
101 100
102 std::string SyncNotificationDelegate::id() const { 101 std::string SyncNotificationDelegate::id() const {
103 return id_; 102 return id_;
104 } 103 }
105 104
106 content::WebContents* SyncNotificationDelegate::GetWebContents() const {
107 return NULL;
108 }
109
110 void SyncNotificationDelegate::ShowSyncSetup() { 105 void SyncNotificationDelegate::ShowSyncSetup() {
111 LoginUIService* login_ui = LoginUIServiceFactory::GetForProfile(profile_); 106 LoginUIService* login_ui = LoginUIServiceFactory::GetForProfile(profile_);
112 if (login_ui->current_login_ui()) { 107 if (login_ui->current_login_ui()) {
113 // TODO(michaelpg): The LoginUI might be on an inactive desktop. 108 // TODO(michaelpg): The LoginUI might be on an inactive desktop.
114 // See crbug.com/354280. 109 // See crbug.com/354280.
115 login_ui->current_login_ui()->FocusUI(); 110 login_ui->current_login_ui()->FocusUI();
116 return; 111 return;
117 } 112 }
118 113
119 chrome::ShowSettingsSubPageForProfile(profile_, chrome::kSyncSetupSubPage); 114 chrome::ShowSettingsSubPageForProfile(profile_, chrome::kSyncSetupSubPage);
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 ui::ResourceBundle::GetSharedInstance().GetImageNamed( 194 ui::ResourceBundle::GetSharedInstance().GetImageNamed(
200 IDR_NOTIFICATION_ALERT), 195 IDR_NOTIFICATION_ALERT),
201 blink::WebTextDirectionDefault, 196 blink::WebTextDirectionDefault,
202 notifier_id, 197 notifier_id,
203 base::string16(), // display_source 198 base::string16(), // display_source
204 base::ASCIIToUTF16(notification_id_), 199 base::ASCIIToUTF16(notification_id_),
205 data, 200 data,
206 delegate); 201 delegate);
207 notification_ui_manager->Add(notification, profile_); 202 notification_ui_manager->Add(notification, profile_);
208 } 203 }
OLDNEW
« no previous file with comments | « chrome/browser/status_icons/desktop_notification_balloon.cc ('k') | chrome/browser/ui/ash/screenshot_taker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698