| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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/gtk/location_bar_view_gtk.h" | 5 #include "chrome/browser/gtk/location_bar_view_gtk.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "app/gfx/canvas_paint.h" | 9 #include "app/gfx/canvas_paint.h" |
| 10 #include "app/gfx/gtk_util.h" | 10 #include "app/gfx/gtk_util.h" |
| (...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 345 void LocationBarViewGtk::OnInputInProgress(bool in_progress) { | 345 void LocationBarViewGtk::OnInputInProgress(bool in_progress) { |
| 346 // This is identical to the Windows code, except that we don't proxy the call | 346 // This is identical to the Windows code, except that we don't proxy the call |
| 347 // back through the Toolbar, and just access the model here. | 347 // back through the Toolbar, and just access the model here. |
| 348 // The edit should make sure we're only notified when something changes. | 348 // The edit should make sure we're only notified when something changes. |
| 349 DCHECK(toolbar_model_->input_in_progress() != in_progress); | 349 DCHECK(toolbar_model_->input_in_progress() != in_progress); |
| 350 | 350 |
| 351 toolbar_model_->set_input_in_progress(in_progress); | 351 toolbar_model_->set_input_in_progress(in_progress); |
| 352 Update(NULL); | 352 Update(NULL); |
| 353 } | 353 } |
| 354 | 354 |
| 355 void LocationBarViewGtk::OnKillFocus() { |
| 356 } |
| 357 |
| 355 void LocationBarViewGtk::OnSetFocus() { | 358 void LocationBarViewGtk::OnSetFocus() { |
| 356 } | 359 } |
| 357 | 360 |
| 358 SkBitmap LocationBarViewGtk::GetFavIcon() const { | 361 SkBitmap LocationBarViewGtk::GetFavIcon() const { |
| 359 NOTIMPLEMENTED(); | 362 NOTIMPLEMENTED(); |
| 360 return SkBitmap(); | 363 return SkBitmap(); |
| 361 } | 364 } |
| 362 | 365 |
| 363 std::wstring LocationBarViewGtk::GetTitle() const { | 366 std::wstring LocationBarViewGtk::GetTitle() const { |
| 364 NOTIMPLEMENTED(); | 367 NOTIMPLEMENTED(); |
| (...skipping 455 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 820 const ExtensionActionState* state = | 823 const ExtensionActionState* state = |
| 821 contents->GetPageActionState(view->page_action_); | 824 contents->GetPageActionState(view->page_action_); |
| 822 if (!state || state->badge_text().empty()) | 825 if (!state || state->badge_text().empty()) |
| 823 return FALSE; | 826 return FALSE; |
| 824 | 827 |
| 825 gfx::CanvasPaint canvas(event, false); | 828 gfx::CanvasPaint canvas(event, false); |
| 826 gfx::Rect bounding_rect(widget->allocation); | 829 gfx::Rect bounding_rect(widget->allocation); |
| 827 state->PaintBadge(&canvas, bounding_rect); | 830 state->PaintBadge(&canvas, bounding_rect); |
| 828 return FALSE; | 831 return FALSE; |
| 829 } | 832 } |
| OLD | NEW |