Use the original profile when opening the keyword editor window, since

otherwise the profile pointer may go stale if it was opened from an Incognito
window.

Simplify the check that already does this on Mac. GetOriginalProfile() returns
the profile it's called on, if it isn't incognito.

BUG=23359
TEST=open Incognito window, right-click in omnibox, Edit Search Engines,
    close Incog window, edit an engine
Review URL: http://codereview.chromium.org/307010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29666 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 4 deletions

diff --git a/chrome/browser/cocoa/keyword_editor_cocoa_controller.mm b/chrome/browser/cocoa/keyword_editor_cocoa_controller.mm
index a511a23..032ffbb 100644
--- a/chrome/browser/cocoa/keyword_editor_cocoa_controller.mm
+++ b/chrome/browser/cocoa/keyword_editor_cocoa_controller.mm
@@ -134,9 +134,7 @@ typedef std::map<Profile*,KeywordEditorCocoaController*> ProfileControllerMap;
   // opened from an incognito window, which can leave the panel
   // holding onto a stale profile.  Since the same panel is used
   // either way, arrange to use the original profile instead.
-  if (profile->IsOffTheRecord()) {
-    profile = profile->GetOriginalProfile();
-  }
+  profile = profile->GetOriginalProfile();
 
   ProfileControllerMap* map = Singleton<ProfileControllerMap>::get();
   DCHECK(map != NULL);
@@ -326,7 +324,7 @@ typedef std::map<Profile*,KeywordEditorCocoaController*> ProfileControllerMap;
   // Set the favicon and title for the search engine in the name column.
   if ([[tableColumn identifier] isEqualToString:@"name"]) {
     DCHECK([cell isKindOfClass:[NSButtonCell class]]);
-	NSButtonCell* buttonCell = static_cast<NSButtonCell*>(cell);
+    NSButtonCell* buttonCell = static_cast<NSButtonCell*>(cell);
     std::wstring title = controller_->table_model()->GetText(row,
         IDS_SEARCH_ENGINES_EDITOR_DESCRIPTION_COLUMN);
     [buttonCell setTitle:base::SysWideToNSString(title)];