diff options
Diffstat (limited to 'chrome/browser/ui')
29 files changed, 50 insertions, 50 deletions
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index 469e47b..e08b210 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -4054,7 +4054,7 @@ void Browser::SwapTabContents(TabContentsWrapper* old_tab_contents, /////////////////////////////////////////////////////////////////////////////// // Browser, SearchEngineTabHelperDelegate implementation: -void Browser::ConfirmAddSearchProvider(const TemplateURL* template_url, +void Browser::ConfirmAddSearchProvider(TemplateURL* template_url, Profile* profile) { window()->ConfirmAddSearchProvider(template_url, profile); } diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h index 43dad16..8d0dfd5 100644 --- a/chrome/browser/ui/browser.h +++ b/chrome/browser/ui/browser.h @@ -1066,7 +1066,7 @@ class Browser : public TabHandlerDelegate, TabContentsWrapper* new_tab_contents) OVERRIDE; // Overridden from SearchEngineTabHelperDelegate: - virtual void ConfirmAddSearchProvider(const TemplateURL* template_url, + virtual void ConfirmAddSearchProvider(TemplateURL* template_url, Profile* profile) OVERRIDE; // Overridden from ConstrainedWindowTabHelperDelegate: diff --git a/chrome/browser/ui/browser_window.h b/chrome/browser/ui/browser_window.h index 52e0794..a64196c8 100644 --- a/chrome/browser/ui/browser_window.h +++ b/chrome/browser/ui/browser_window.h @@ -191,7 +191,7 @@ class BrowserWindow : public BaseWindow { // Shows a confirmation dialog box for adding a search engine described by // |template_url|. Takes ownership of |template_url|. - virtual void ConfirmAddSearchProvider(const TemplateURL* template_url, + virtual void ConfirmAddSearchProvider(TemplateURL* template_url, Profile* profile) = 0; // Shows or hides the bookmark bar depending on its current visibility. diff --git a/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.h b/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.h index 4ab711d..51f8d3d 100644 --- a/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.h +++ b/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -32,13 +32,13 @@ class TemplateURL; IBOutlet NSBox* fieldAndImageContainer_; Profile* profile_; // weak - const TemplateURL* templateURL_; // weak + TemplateURL* templateURL_; // weak scoped_ptr<EditSearchEngineController> controller_; } - (id)initWithProfile:(Profile*)profile delegate:(EditSearchEngineControllerDelegate*)delegate - templateURL:(const TemplateURL*)url; + templateURL:(TemplateURL*)url; - (IBAction)cancel:(id)sender; - (IBAction)save:(id)sender; diff --git a/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.mm b/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.mm index e1c15db..5d2d2a6 100644 --- a/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.mm +++ b/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.mm @@ -32,7 +32,7 @@ void ShiftOriginY(NSView* view, CGFloat amount) { - (id)initWithProfile:(Profile*)profile delegate:(EditSearchEngineControllerDelegate*)delegate - templateURL:(const TemplateURL*)url { + templateURL:(TemplateURL*)url { DCHECK(profile); NSString* nibpath = [base::mac::FrameworkBundle() pathForResource:@"EditSearchEngine" diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.h b/chrome/browser/ui/cocoa/browser_window_cocoa.h index ef822e9..e47b7eb 100644 --- a/chrome/browser/ui/cocoa/browser_window_cocoa.h +++ b/chrome/browser/ui/cocoa/browser_window_cocoa.h @@ -83,7 +83,7 @@ class BrowserWindowCocoa : public BrowserWindow, virtual bool IsToolbarVisible() const OVERRIDE; virtual gfx::Rect GetRootWindowResizerRect() const OVERRIDE; virtual bool IsPanel() const OVERRIDE; - virtual void ConfirmAddSearchProvider(const TemplateURL* template_url, + virtual void ConfirmAddSearchProvider(TemplateURL* template_url, Profile* profile) OVERRIDE; virtual void ToggleBookmarkBar() OVERRIDE; virtual void ShowAboutChromeDialog() OVERRIDE; diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm index 7623fce..537fa99 100644 --- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm +++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm @@ -315,7 +315,7 @@ bool BrowserWindowCocoa::IsFullscreenBubbleVisible() const { } void BrowserWindowCocoa::ConfirmAddSearchProvider( - const TemplateURL* template_url, + TemplateURL* template_url, Profile* profile) { // The controller will release itself when the window closes. EditSearchEngineCocoaController* editor = diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc index c30674c..c7274f4 100644 --- a/chrome/browser/ui/gtk/browser_window_gtk.cc +++ b/chrome/browser/ui/gtk/browser_window_gtk.cc @@ -1018,7 +1018,7 @@ bool BrowserWindowGtk::IsPanel() const { return false; } -void BrowserWindowGtk::ConfirmAddSearchProvider(const TemplateURL* template_url, +void BrowserWindowGtk::ConfirmAddSearchProvider(TemplateURL* template_url, Profile* profile) { new EditSearchEngineDialog(window_, template_url, NULL, profile); } diff --git a/chrome/browser/ui/gtk/browser_window_gtk.h b/chrome/browser/ui/gtk/browser_window_gtk.h index 43c8229..46efc31 100644 --- a/chrome/browser/ui/gtk/browser_window_gtk.h +++ b/chrome/browser/ui/gtk/browser_window_gtk.h @@ -117,7 +117,7 @@ class BrowserWindowGtk : public BrowserWindow, virtual bool IsToolbarVisible() const OVERRIDE; virtual gfx::Rect GetRootWindowResizerRect() const OVERRIDE; virtual bool IsPanel() const OVERRIDE; - virtual void ConfirmAddSearchProvider(const TemplateURL* template_url, + virtual void ConfirmAddSearchProvider(TemplateURL* template_url, Profile* profile) OVERRIDE; virtual void ToggleBookmarkBar() OVERRIDE; virtual void ShowAboutChromeDialog() OVERRIDE; diff --git a/chrome/browser/ui/gtk/edit_search_engine_dialog.cc b/chrome/browser/ui/gtk/edit_search_engine_dialog.cc index 1cb853c8..0c11cb6 100644 --- a/chrome/browser/ui/gtk/edit_search_engine_dialog.cc +++ b/chrome/browser/ui/gtk/edit_search_engine_dialog.cc @@ -67,7 +67,7 @@ void SetWidgetStyle(GtkWidget* entry, GtkStyle* label_style, EditSearchEngineDialog::EditSearchEngineDialog( GtkWindow* parent_window, - const TemplateURL* template_url, + TemplateURL* template_url, EditSearchEngineControllerDelegate* delegate, Profile* profile) : controller_(new EditSearchEngineController(template_url, delegate, diff --git a/chrome/browser/ui/gtk/edit_search_engine_dialog.h b/chrome/browser/ui/gtk/edit_search_engine_dialog.h index e1fcbbc..d387598 100644 --- a/chrome/browser/ui/gtk/edit_search_engine_dialog.h +++ b/chrome/browser/ui/gtk/edit_search_engine_dialog.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -22,7 +22,7 @@ class TemplateURL; class EditSearchEngineDialog { public: EditSearchEngineDialog(GtkWindow* parent_window, - const TemplateURL* template_url, + TemplateURL* template_url, EditSearchEngineControllerDelegate* delegate, Profile* profile); ~EditSearchEngineDialog(); diff --git a/chrome/browser/ui/panels/panel.cc b/chrome/browser/ui/panels/panel.cc index bb92907..2d5cc59 100644 --- a/chrome/browser/ui/panels/panel.cc +++ b/chrome/browser/ui/panels/panel.cc @@ -458,7 +458,7 @@ void Panel::DisableInactiveFrame() { NOTIMPLEMENTED(); } -void Panel::ConfirmAddSearchProvider(const TemplateURL* template_url, +void Panel::ConfirmAddSearchProvider(TemplateURL* template_url, Profile* profile) { NOTIMPLEMENTED(); } diff --git a/chrome/browser/ui/panels/panel.h b/chrome/browser/ui/panels/panel.h index a868189..bcc9335 100644 --- a/chrome/browser/ui/panels/panel.h +++ b/chrome/browser/ui/panels/panel.h @@ -136,7 +136,7 @@ class Panel : public BrowserWindow, virtual gfx::Rect GetRootWindowResizerRect() const OVERRIDE; virtual bool IsPanel() const OVERRIDE; virtual void DisableInactiveFrame() OVERRIDE; - virtual void ConfirmAddSearchProvider(const TemplateURL* template_url, + virtual void ConfirmAddSearchProvider(TemplateURL* template_url, Profile* profile) OVERRIDE; virtual void ToggleBookmarkBar() OVERRIDE; virtual void ShowAboutChromeDialog() OVERRIDE; diff --git a/chrome/browser/ui/search_engines/edit_search_engine_controller.cc b/chrome/browser/ui/search_engines/edit_search_engine_controller.cc index ad9ec91..58562a3 100644 --- a/chrome/browser/ui/search_engines/edit_search_engine_controller.cc +++ b/chrome/browser/ui/search_engines/edit_search_engine_controller.cc @@ -17,7 +17,7 @@ using content::UserMetricsAction; EditSearchEngineController::EditSearchEngineController( - const TemplateURL* template_url, + TemplateURL* template_url, EditSearchEngineControllerDelegate* edit_keyword_delegate, Profile* profile) : template_url_(template_url), @@ -82,7 +82,7 @@ void EditSearchEngineController::AcceptAddOrEdit( TemplateURLService* template_url_service = TemplateURLServiceFactory::GetForProfile(profile_); - const TemplateURL* existing = + TemplateURL* existing = template_url_service->GetTemplateURLForKeyword(keyword_input); if (existing && (!edit_keyword_delegate_ || existing != template_url_)) { // An entry may have been added with the same keyword string while the diff --git a/chrome/browser/ui/search_engines/edit_search_engine_controller.h b/chrome/browser/ui/search_engines/edit_search_engine_controller.h index c6cf069..f5aff7f 100644 --- a/chrome/browser/ui/search_engines/edit_search_engine_controller.h +++ b/chrome/browser/ui/search_engines/edit_search_engine_controller.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -21,7 +21,7 @@ class EditSearchEngineControllerDelegate { // EditSearchEngineController's constructor, and may be NULL. A NULL value // indicates a new TemplateURL should be created rather than modifying an // existing TemplateURL. - virtual void OnEditedKeyword(const TemplateURL* template_url, + virtual void OnEditedKeyword(TemplateURL* template_url, const string16& title, const string16& keyword, const std::string& url) = 0; @@ -36,7 +36,7 @@ class EditSearchEngineController { public: // The |template_url| and/or |edit_keyword_delegate| may be NULL. EditSearchEngineController( - const TemplateURL* template_url, + TemplateURL* template_url, EditSearchEngineControllerDelegate* edit_keyword_delegate, Profile* profile); ~EditSearchEngineController() {} @@ -76,7 +76,7 @@ class EditSearchEngineController { // The TemplateURL we're displaying information for. It may be NULL. If we // have a keyword_editor_view, we assume that this TemplateURL is already in // the TemplateURLService; if not, we assume it isn't. - const TemplateURL* template_url_; + TemplateURL* template_url_; // We may have been created by this, in which case we will call back to it on // success to add/modify the entry. May be NULL. diff --git a/chrome/browser/ui/search_engines/keyword_editor_controller.cc b/chrome/browser/ui/search_engines/keyword_editor_controller.cc index 18899c8..6118b76 100644 --- a/chrome/browser/ui/search_engines/keyword_editor_controller.cc +++ b/chrome/browser/ui/search_engines/keyword_editor_controller.cc @@ -50,7 +50,7 @@ int KeywordEditorController::AddTemplateURL(const string16& title, return new_index; } -void KeywordEditorController::ModifyTemplateURL(const TemplateURL* template_url, +void KeywordEditorController::ModifyTemplateURL(TemplateURL* template_url, const string16& title, const string16& keyword, const std::string& url) { @@ -98,7 +98,7 @@ bool KeywordEditorController::loaded() const { return url_model()->loaded(); } -const TemplateURL* KeywordEditorController::GetTemplateURL(int index) const { +TemplateURL* KeywordEditorController::GetTemplateURL(int index) { return table_model_->GetTemplateURL(index); } diff --git a/chrome/browser/ui/search_engines/keyword_editor_controller.h b/chrome/browser/ui/search_engines/keyword_editor_controller.h index 8b4e0e9..565c1d8 100644 --- a/chrome/browser/ui/search_engines/keyword_editor_controller.h +++ b/chrome/browser/ui/search_engines/keyword_editor_controller.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -34,7 +34,7 @@ class KeywordEditorController { // Invoked when the user modifies a TemplateURL. Updates the // TemplateURLService and table model appropriately. - void ModifyTemplateURL(const TemplateURL* template_url, + void ModifyTemplateURL(TemplateURL* template_url, const string16& title, const string16& keyword, const std::string& url); @@ -59,7 +59,7 @@ class KeywordEditorController { bool loaded() const; // Return the TemplateURL corresponding to the |index| in the model. - const TemplateURL* GetTemplateURL(int index) const; + TemplateURL* GetTemplateURL(int index); TemplateURLTableModel* table_model() { return table_model_.get(); diff --git a/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc b/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc index 7373089..276f00d 100644 --- a/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc +++ b/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc @@ -146,7 +146,7 @@ TEST_F(KeywordEditorControllerTest, Modify) { ClearChangeCount(); // Modify the entry. - const TemplateURL* turl = model_->GetTemplateURLs()[0]; + TemplateURL* turl = model_->GetTemplateURLs()[0]; controller_->ModifyTemplateURL(turl, kA1, kB1, "http://c1"); // Make sure it was updated appropriately. diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc b/chrome/browser/ui/search_engines/search_engine_tab_helper.cc index b10bfac..0a93c5b 100644 --- a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc +++ b/chrome/browser/ui/search_engines/search_engine_tab_helper.cc @@ -157,7 +157,7 @@ void SearchEngineTabHelper::GenerateKeywordIfNecessary( return; } - const TemplateURL* current_url; + TemplateURL* current_url; GURL url = params.searchable_form_url; if (!url_service->CanReplaceKeyword(keyword, url, ¤t_url)) return; diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h b/chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h index b6eaf3b2..4ab194b 100644 --- a/chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h +++ b/chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h @@ -19,7 +19,7 @@ class SearchEngineTabHelperDelegate { public: // Shows a confirmation dialog box for adding a search engine described by // |template_url|. Takes ownership of |template_url|. - virtual void ConfirmAddSearchProvider(const TemplateURL* template_url, + virtual void ConfirmAddSearchProvider(TemplateURL* template_url, Profile* profile) = 0; protected: diff --git a/chrome/browser/ui/search_engines/template_url_table_model.cc b/chrome/browser/ui/search_engines/template_url_table_model.cc index 256a9c1..8ba1e88 100644 --- a/chrome/browser/ui/search_engines/template_url_table_model.cc +++ b/chrome/browser/ui/search_engines/template_url_table_model.cc @@ -35,7 +35,7 @@ static SkBitmap* default_icon = NULL; class ModelEntry { public: - ModelEntry(TemplateURLTableModel* model, const TemplateURL* template_url) + ModelEntry(TemplateURLTableModel* model, TemplateURL* template_url) : template_url_(template_url), load_state_(NOT_LOADED), model_(model) { @@ -45,7 +45,7 @@ class ModelEntry { } } - const TemplateURL* template_url() { + TemplateURL* template_url() { return template_url_; } @@ -108,7 +108,7 @@ class ModelEntry { } } - const TemplateURL* template_url_; + TemplateURL* template_url_; SkBitmap favicon_; LoadState load_state_; TemplateURLTableModel* model_; @@ -145,7 +145,7 @@ void TemplateURLTableModel::Reload() { // Keywords that can be made the default first. for (TemplateURLService::TemplateURLVector::iterator i = urls.begin(); i != urls.end(); ++i) { - const TemplateURL* template_url = *i; + TemplateURL* template_url = *i; // NOTE: we don't use ShowInDefaultList here to avoid items bouncing around // the lists while editing. if (template_url->show_in_default_list()) @@ -157,7 +157,7 @@ void TemplateURLTableModel::Reload() { // Then the rest. for (TemplateURLService::TemplateURLVector::iterator i = urls.begin(); i != urls.end(); ++i) { - const TemplateURL* template_url = *i; + TemplateURL* template_url = *i; // NOTE: we don't use ShowInDefaultList here to avoid things bouncing // the lists while editing. if (!template_url->show_in_default_list() && @@ -233,7 +233,7 @@ void TemplateURLTableModel::Remove(int index) { // Remove the observer while we modify the model, that way we don't need to // worry about the model calling us back when we mutate it. template_url_service_->RemoveObserver(this); - const TemplateURL* template_url = GetTemplateURL(index); + TemplateURL* template_url = GetTemplateURL(index); scoped_ptr<ModelEntry> entry(entries_[index]); entries_.erase(entries_.begin() + index); @@ -274,7 +274,7 @@ void TemplateURLTableModel::ModifyTemplateURL(int index, const std::string& url) { DCHECK(index >= 0 && index <= RowCount()); DCHECK(!url.empty()); - const TemplateURL* template_url = GetTemplateURL(index); + TemplateURL* template_url = GetTemplateURL(index); // The default search provider should support replacement. DCHECK(template_url_service_->GetDefaultSearchProvider() != template_url || template_url->SupportsReplacement()); @@ -292,7 +292,7 @@ void TemplateURLTableModel::ReloadIcon(int index) { NotifyChanged(index); } -const TemplateURL* TemplateURLTableModel::GetTemplateURL(int index) { +TemplateURL* TemplateURLTableModel::GetTemplateURL(int index) { return entries_[index]->template_url(); } @@ -329,7 +329,7 @@ int TemplateURLTableModel::MakeDefaultTemplateURL(int index) { return -1; } - const TemplateURL* keyword = GetTemplateURL(index); + TemplateURL* keyword = GetTemplateURL(index); const TemplateURL* current_default = template_url_service_->GetDefaultSearchProvider(); if (current_default == keyword) diff --git a/chrome/browser/ui/search_engines/template_url_table_model.h b/chrome/browser/ui/search_engines/template_url_table_model.h index 702d7cb9..3ee549b 100644 --- a/chrome/browser/ui/search_engines/template_url_table_model.h +++ b/chrome/browser/ui/search_engines/template_url_table_model.h @@ -70,7 +70,7 @@ class TemplateURLTableModel : public ui::TableModel, void ReloadIcon(int index); // Returns the TemplateURL at the specified index. - const TemplateURL* GetTemplateURL(int index); + TemplateURL* GetTemplateURL(int index); // Returns the index of the TemplateURL, or -1 if it the TemplateURL is not // found. diff --git a/chrome/browser/ui/views/browser_dialogs.h b/chrome/browser/ui/views/browser_dialogs.h index d29b3e7..97fb06a 100644 --- a/chrome/browser/ui/views/browser_dialogs.h +++ b/chrome/browser/ui/views/browser_dialogs.h @@ -85,7 +85,7 @@ void ShowLoginWizard(const std::string& start_screen, const gfx::Size& size); // to be notified when the user is done editing, or NULL. If NULL, the dialog // will update the model with the user's edits directly. void EditSearchEngine(gfx::NativeWindow parent, - const TemplateURL* template_url, + TemplateURL* template_url, EditSearchEngineControllerDelegate* delegate, Profile* profile); diff --git a/chrome/browser/ui/views/edit_search_engine_dialog.cc b/chrome/browser/ui/views/edit_search_engine_dialog.cc index 805deea..d962008 100644 --- a/chrome/browser/ui/views/edit_search_engine_dialog.cc +++ b/chrome/browser/ui/views/edit_search_engine_dialog.cc @@ -31,7 +31,7 @@ using views::Textfield; namespace browser { void EditSearchEngine(gfx::NativeWindow parent, - const TemplateURL* template_url, + TemplateURL* template_url, EditSearchEngineControllerDelegate* delegate, Profile* profile) { EditSearchEngineDialog::Show(parent, template_url, delegate, profile); @@ -40,7 +40,7 @@ void EditSearchEngine(gfx::NativeWindow parent, } // namespace browser EditSearchEngineDialog::EditSearchEngineDialog( - const TemplateURL* template_url, + TemplateURL* template_url, EditSearchEngineControllerDelegate* delegate, Profile* profile) : controller_(new EditSearchEngineController(template_url, @@ -54,7 +54,7 @@ EditSearchEngineDialog::~EditSearchEngineDialog() { // static void EditSearchEngineDialog::Show(gfx::NativeWindow parent, - const TemplateURL* template_url, + TemplateURL* template_url, EditSearchEngineControllerDelegate* delegate, Profile* profile) { EditSearchEngineDialog* contents = diff --git a/chrome/browser/ui/views/edit_search_engine_dialog.h b/chrome/browser/ui/views/edit_search_engine_dialog.h index 83b3994..eb40bda1 100644 --- a/chrome/browser/ui/views/edit_search_engine_dialog.h +++ b/chrome/browser/ui/views/edit_search_engine_dialog.h @@ -28,14 +28,14 @@ class EditSearchEngineDialog : public views::TextfieldController, public views::DialogDelegateView { public: // The |template_url| and/or |delegate| may be NULL. - EditSearchEngineDialog(const TemplateURL* template_url, + EditSearchEngineDialog(TemplateURL* template_url, EditSearchEngineControllerDelegate* delegate, Profile* profile); virtual ~EditSearchEngineDialog(); // Shows the dialog to the user. static void Show(gfx::NativeWindow parent, - const TemplateURL* template_url, + TemplateURL* template_url, EditSearchEngineControllerDelegate* delegate, Profile* profile); diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index 5bbca22..68409c4 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -1043,7 +1043,7 @@ void BrowserView::DisableInactiveFrame() { #endif // No tricks are needed to get the right behavior on Linux. } -void BrowserView::ConfirmAddSearchProvider(const TemplateURL* template_url, +void BrowserView::ConfirmAddSearchProvider(TemplateURL* template_url, Profile* profile) { browser::EditSearchEngine(GetWidget()->GetNativeWindow(), template_url, NULL, profile); diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h index e634c89..cfd430c 100644 --- a/chrome/browser/ui/views/frame/browser_view.h +++ b/chrome/browser/ui/views/frame/browser_view.h @@ -262,7 +262,7 @@ class BrowserView : public BrowserWindow, virtual bool IsPanel() const OVERRIDE; virtual gfx::Rect GetRootWindowResizerRect() const OVERRIDE; virtual void DisableInactiveFrame() OVERRIDE; - virtual void ConfirmAddSearchProvider(const TemplateURL* template_url, + virtual void ConfirmAddSearchProvider(TemplateURL* template_url, Profile* profile) OVERRIDE; virtual void ToggleBookmarkBar() OVERRIDE; virtual void ShowAboutChromeDialog() OVERRIDE; diff --git a/chrome/browser/ui/webui/options2/search_engine_manager_handler2.cc b/chrome/browser/ui/webui/options2/search_engine_manager_handler2.cc index d30b03a..38f03a3 100644 --- a/chrome/browser/ui/webui/options2/search_engine_manager_handler2.cc +++ b/chrome/browser/ui/webui/options2/search_engine_manager_handler2.cc @@ -249,7 +249,7 @@ void SearchEngineManagerHandler::EditSearchEngine(const ListValue* args) { } void SearchEngineManagerHandler::OnEditedKeyword( - const TemplateURL* template_url, + TemplateURL* template_url, const string16& title, const string16& keyword, const std::string& url) { diff --git a/chrome/browser/ui/webui/options2/search_engine_manager_handler2.h b/chrome/browser/ui/webui/options2/search_engine_manager_handler2.h index 42984a4..95af05ed 100644 --- a/chrome/browser/ui/webui/options2/search_engine_manager_handler2.h +++ b/chrome/browser/ui/webui/options2/search_engine_manager_handler2.h @@ -34,7 +34,7 @@ class SearchEngineManagerHandler : public OptionsPageUIHandler, virtual void OnItemsRemoved(int start, int length) OVERRIDE; // EditSearchEngineControllerDelegate implementation. - virtual void OnEditedKeyword(const TemplateURL* template_url, + virtual void OnEditedKeyword(TemplateURL* template_url, const string16& title, const string16& keyword, const std::string& url) OVERRIDE; |