OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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/browser.h" | 5 #include "chrome/browser/browser.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/idle_timer.h" | 8 #include "base/idle_timer.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/string_util.h" | 10 #include "base/string_util.h" |
(...skipping 2225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2236 // title. | 2236 // title. |
2237 bool invalidate_tab = false; | 2237 bool invalidate_tab = false; |
2238 if (flags & TabContents::INVALIDATE_TITLE || | 2238 if (flags & TabContents::INVALIDATE_TITLE || |
2239 flags & TabContents::INVALIDATE_FAVICON) { | 2239 flags & TabContents::INVALIDATE_FAVICON) { |
2240 invalidate_tab = true; | 2240 invalidate_tab = true; |
2241 | 2241 |
2242 // Anything that repaints the tab means the favicon is updated. | 2242 // Anything that repaints the tab means the favicon is updated. |
2243 updated_stuff[contents] |= TabContents::INVALIDATE_FAVICON; | 2243 updated_stuff[contents] |= TabContents::INVALIDATE_FAVICON; |
2244 } | 2244 } |
2245 | 2245 |
| 2246 if (flags & TabContents::INVALIDATE_FEEDLIST) |
| 2247 window()->GetLocationBar()->UpdateFeedIcon(); |
| 2248 |
2246 // Updating the URL happens synchronously in ScheduleUIUpdate. | 2249 // Updating the URL happens synchronously in ScheduleUIUpdate. |
2247 | 2250 |
2248 if (flags & TabContents::INVALIDATE_LOAD && GetStatusBubble()) | 2251 if (flags & TabContents::INVALIDATE_LOAD && GetStatusBubble()) |
2249 GetStatusBubble()->SetStatus(GetSelectedTabContents()->GetStatusText()); | 2252 GetStatusBubble()->SetStatus(GetSelectedTabContents()->GetStatusText()); |
2250 | 2253 |
2251 if (invalidate_tab) { // INVALIDATE_TITLE or INVALIDATE_FAVICON. | 2254 if (invalidate_tab) { // INVALIDATE_TITLE or INVALIDATE_FAVICON. |
2252 tabstrip_model_.UpdateTabContentsStateAt( | 2255 tabstrip_model_.UpdateTabContentsStateAt( |
2253 tabstrip_model_.GetIndexOfController(contents->controller())); | 2256 tabstrip_model_.GetIndexOfController(contents->controller())); |
2254 window_->UpdateTitleBar(); | 2257 window_->UpdateTitleBar(); |
2255 | 2258 |
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2476 | 2479 |
2477 // We need to register the window position pref. | 2480 // We need to register the window position pref. |
2478 std::wstring window_pref(prefs::kBrowserWindowPlacement); | 2481 std::wstring window_pref(prefs::kBrowserWindowPlacement); |
2479 window_pref.append(L"_"); | 2482 window_pref.append(L"_"); |
2480 window_pref.append(app_name); | 2483 window_pref.append(app_name); |
2481 PrefService* prefs = g_browser_process->local_state(); | 2484 PrefService* prefs = g_browser_process->local_state(); |
2482 DCHECK(prefs); | 2485 DCHECK(prefs); |
2483 | 2486 |
2484 prefs->RegisterDictionaryPref(window_pref.c_str()); | 2487 prefs->RegisterDictionaryPref(window_pref.c_str()); |
2485 } | 2488 } |
OLD | NEW |