diff options
| -rw-r--r-- | chrome/browser/find_bar_controller.cc | 1 | ||||
| -rw-r--r-- | chrome/browser/google_update.cc | 5 | ||||
| -rw-r--r-- | chrome/views/controls/hwnd_view.cc | 6 | ||||
| -rw-r--r-- | webkit/glue/webframe_impl.cc | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/find_bar_controller.cc b/chrome/browser/find_bar_controller.cc index 81e759b..c9c6d51 100644 --- a/chrome/browser/find_bar_controller.cc +++ b/chrome/browser/find_bar_controller.cc @@ -114,7 +114,6 @@ void FindBarController::Observe(NotificationType type, if (Source<TabContents>(source).ptr() == web_contents_) { find_bar_->UpdateUIForFindResult(web_contents_->find_result(), web_contents_->find_text()); - FindNotificationDetails details = web_contents_->find_result(); } } else if (type == NotificationType::NAV_ENTRY_COMMITTED) { NavigationController* source_controller = diff --git a/chrome/browser/google_update.cc b/chrome/browser/google_update.cc index 70ee2ab..fceede8 100644 --- a/chrome/browser/google_update.cc +++ b/chrome/browser/google_update.cc @@ -13,7 +13,6 @@ #include "base/task.h" #include "base/thread.h" #include "base/win_util.h" - #include "chrome/app/client_util.h" #include "chrome/browser/browser_process.h" #include "chrome/installer/util/google_update_constants.h" @@ -98,7 +97,9 @@ class GoogleUpdateJobObserver COM_INTERFACE_ENTRY(IJobObserver) END_COM_MAP() - GoogleUpdateJobObserver() {} + GoogleUpdateJobObserver() + : result_(UPGRADE_ERROR) { + } virtual ~GoogleUpdateJobObserver() {} // Notifications from Google Update: diff --git a/chrome/views/controls/hwnd_view.cc b/chrome/views/controls/hwnd_view.cc index a376c8b..cc9df6d 100644 --- a/chrome/views/controls/hwnd_view.cc +++ b/chrome/views/controls/hwnd_view.cc @@ -127,7 +127,7 @@ void HWNDView::UpdateHWNDBounds() { // it. ::SetWindowPos(hwnd_, 0, 0, 0, 0, 0, SWP_HIDEWINDOW | SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | - SWP_NOREDRAW | SWP_NOOWNERZORDER ); + SWP_NOREDRAW | SWP_NOOWNERZORDER); } } @@ -150,9 +150,9 @@ void HWNDView::ViewHierarchyChanged(bool is_add, View *parent, View *child) { if (hwnd_) { Widget* widget = GetWidget(); if (is_add && widget) { - HWND parent = ::GetParent(hwnd_); + HWND parent_hwnd = ::GetParent(hwnd_); HWND widget_hwnd = widget->GetNativeView(); - if (parent != widget_hwnd) { + if (parent_hwnd != widget_hwnd) { ::SetParent(hwnd_, widget_hwnd); } if (IsVisibleInRootView()) diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc index 13de844..9f87b20 100644 --- a/webkit/glue/webframe_impl.cc +++ b/webkit/glue/webframe_impl.cc @@ -1110,7 +1110,7 @@ void WebFrameImpl::ScopeStringMatches(FindInPageRequest request, RefPtr<Range> search_range(rangeOfContents(frame()->document())); ExceptionCode ec = 0, ec2 = 0; - if (!reset && resume_scoping_from_range_.get()) { + if (resume_scoping_from_range_.get()) { // This is a continuation of a scoping operation that timed out and didn't // complete last time around, so we should start from where we left off. search_range->setStart(resume_scoping_from_range_->startContainer(), |