diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-11 20:53:37 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-05-16 13:54:48 +0100 |
| commit | 21d179b334e59e9a3bfcaed4c4430bef1bc5759d (patch) | |
| tree | 64e2bb6da27af6a5c93ca34f6051584aafbfcb9e /chrome/browser/find_bar_state.cc | |
| parent | 0c63f00edd6ed0482fd5cbcea937ca088baf7858 (diff) | |
| download | external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.zip external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.tar.gz external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.tar.bz2 | |
Merge Chromium at 10.0.621.0: Initial merge by git.
Change-Id: I070cc91c608dfa4a968a5a54c173260765ac8097
Diffstat (limited to 'chrome/browser/find_bar_state.cc')
| -rw-r--r-- | chrome/browser/find_bar_state.cc | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/chrome/browser/find_bar_state.cc b/chrome/browser/find_bar_state.cc deleted file mode 100644 index d33d104..0000000 --- a/chrome/browser/find_bar_state.cc +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) 2010 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. - -#include "chrome/browser/find_bar_state.h" -#include "chrome/browser/profile.h" - -// static -string16 FindBarState::GetLastPrepopulateText(Profile* p) { - FindBarState* state = p->GetFindBarState(); - string16 text = state->last_prepopulate_text(); - - if (text.empty() && p->IsOffTheRecord()) { - // Fall back to the original profile. - state = p->GetOriginalProfile()->GetFindBarState(); - text = state->last_prepopulate_text(); - } - - return text; -} |