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/ui/find_bar/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/ui/find_bar/find_bar_state.cc')
-rw-r--r-- | chrome/browser/ui/find_bar/find_bar_state.cc | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/chrome/browser/ui/find_bar/find_bar_state.cc b/chrome/browser/ui/find_bar/find_bar_state.cc new file mode 100644 index 0000000..d4f2cc1 --- /dev/null +++ b/chrome/browser/ui/find_bar/find_bar_state.cc @@ -0,0 +1,20 @@ +// 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/profiles/profile.h" +#include "chrome/browser/ui/find_bar/find_bar_state.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; +} |