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

Side by Side Diff: chrome/browser/extensions/settings_api_bubble_controller.cc

Issue 312943002: Remove unused param from search engine extension override helper function. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More functions Created 6 years, 6 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
OLDNEW
1 // Copyright (c) 2014 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/extensions/settings_api_bubble_controller.h" 5 #include "chrome/browser/extensions/settings_api_bubble_controller.h"
6 6
7 #include "base/metrics/histogram.h" 7 #include "base/metrics/histogram.h"
8 #include "chrome/browser/extensions/extension_service.h" 8 #include "chrome/browser/extensions/extension_service.h"
9 #include "chrome/browser/extensions/settings_api_helpers.h" 9 #include "chrome/browser/extensions/settings_api_helpers.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 if (!extension) 91 if (!extension)
92 return false; // The extension provided is no longer enabled. 92 return false; // The extension provided is no longer enabled.
93 93
94 extensions::ExtensionPrefs* prefs = extensions::ExtensionPrefs::Get(profile_); 94 extensions::ExtensionPrefs* prefs = extensions::ExtensionPrefs::Get(profile_);
95 if (prefs->HasSettingsApiBubbleBeenAcknowledged(extension_id)) 95 if (prefs->HasSettingsApiBubbleBeenAcknowledged(extension_id))
96 return false; 96 return false;
97 97
98 const extensions::Extension* override = NULL; 98 const extensions::Extension* override = NULL;
99 switch (type_) { 99 switch (type_) {
100 case extensions::BUBBLE_TYPE_HOME_PAGE: 100 case extensions::BUBBLE_TYPE_HOME_PAGE:
101 override = extensions::OverridesHomepage(profile_, NULL); 101 override = extensions::OverridesHomepage(profile_);
102 break; 102 break;
103 case extensions::BUBBLE_TYPE_STARTUP_PAGES: 103 case extensions::BUBBLE_TYPE_STARTUP_PAGES:
104 override = extensions::OverridesStartupPages(profile_, NULL); 104 override = extensions::OverridesStartupPages(profile_);
105 break; 105 break;
106 case extensions::BUBBLE_TYPE_SEARCH_ENGINE: 106 case extensions::BUBBLE_TYPE_SEARCH_ENGINE:
107 override = extensions::OverridesSearchEngine(profile_, NULL); 107 override = extensions::OverridesSearchEngine(profile_);
108 break; 108 break;
109 } 109 }
110 110
111 if (!override || override->id() != extension->id()) 111 if (!override || override->id() != extension->id())
112 return false; 112 return false;
113 113
114 extension_id_ = extension_id; 114 extension_id_ = extension_id;
115 return true; 115 return true;
116 } 116 }
117 117
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 return true; 307 return true;
308 } 308 }
309 309
310 bool SettingsApiBubbleController::CloseOnDeactivate() { 310 bool SettingsApiBubbleController::CloseOnDeactivate() {
311 // Startup bubbles tend to get lost in the focus storm that happens on 311 // Startup bubbles tend to get lost in the focus storm that happens on
312 // startup. Other types should dismiss on focus loss. 312 // startup. Other types should dismiss on focus loss.
313 return type_ != BUBBLE_TYPE_STARTUP_PAGES; 313 return type_ != BUBBLE_TYPE_STARTUP_PAGES;
314 } 314 }
315 315
316 } // namespace extensions 316 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/settings_api_helpers.h » ('j') | chrome/browser/extensions/settings_api_helpers.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698