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

Side by Side Diff: chrome/browser/ui/find_bar/find_bar_controller.cc

Issue 10796020: Upgrade AlignedMemory to support dynamic allocations. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Change AlignedMemory back to POD. Retry now that NaCl fixed. Created 8 years, 4 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/ui/find_bar/find_bar_controller.h" 5 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/i18n/rtl.h" 9 #include "base/i18n/rtl.h"
10 #include "base/logging.h"
10 #include "build/build_config.h" 11 #include "build/build_config.h"
11 #include "chrome/browser/ui/find_bar/find_bar.h" 12 #include "chrome/browser/ui/find_bar/find_bar.h"
12 #include "chrome/browser/ui/find_bar/find_bar_state.h" 13 #include "chrome/browser/ui/find_bar/find_bar_state.h"
13 #include "chrome/browser/ui/find_bar/find_bar_state_factory.h" 14 #include "chrome/browser/ui/find_bar/find_bar_state_factory.h"
14 #include "chrome/browser/ui/find_bar/find_tab_helper.h" 15 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
15 #include "chrome/browser/ui/tab_contents/tab_contents.h" 16 #include "chrome/browser/ui/tab_contents/tab_contents.h"
16 #include "chrome/common/chrome_notification_types.h" 17 #include "chrome/common/chrome_notification_types.h"
17 #include "content/public/browser/navigation_details.h" 18 #include "content/public/browser/navigation_details.h"
18 #include "content/public/browser/navigation_entry.h" 19 #include "content/public/browser/navigation_entry.h"
19 #include "content/public/browser/notification_details.h" 20 #include "content/public/browser/notification_details.h"
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 // shown it is showing the right state for this tab. We update the find text 245 // shown it is showing the right state for this tab. We update the find text
245 // _first_ since the FindBarView checks its emptiness to see if it should 246 // _first_ since the FindBarView checks its emptiness to see if it should
246 // clear the result count display when there's nothing in the box. 247 // clear the result count display when there's nothing in the box.
247 find_bar_->SetFindText(find_string); 248 find_bar_->SetFindText(find_string);
248 #else 249 #else
249 // Having a per-tab find_string is not compatible with OS X's find pasteboard, 250 // Having a per-tab find_string is not compatible with OS X's find pasteboard,
250 // so we always have the same find text in all find bars. This is done through 251 // so we always have the same find text in all find bars. This is done through
251 // the find pasteboard mechanism, so don't set the text here. 252 // the find pasteboard mechanism, so don't set the text here.
252 #endif 253 #endif
253 } 254 }
OLDNEW
« no previous file with comments | « chrome/browser/history/android/android_urls_sql_handler.cc ('k') | chrome/common/extensions/permissions/permissions_info.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698