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

Side by Side Diff: chrome/browser/tab_contents/tab_contents.cc

Issue 155186: Reverting 20097. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 5 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
« no previous file with comments | « chrome/browser/profile.cc ('k') | chrome/browser/thumbnail_store.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/tab_contents/tab_contents.h" 5 #include "chrome/browser/tab_contents/tab_contents.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "app/resource_bundle.h" 8 #include "app/resource_bundle.h"
9 #include "base/file_version_info.h" 9 #include "base/file_version_info.h"
10 #include "base/process_util.h" 10 #include "base/process_util.h"
(...skipping 1632 matching lines...) Expand 10 before | Expand all | Expand 10 after
1643 void TabContents::UpdateTargetURL(int32 page_id, const GURL& url) { 1643 void TabContents::UpdateTargetURL(int32 page_id, const GURL& url) {
1644 if (delegate()) 1644 if (delegate())
1645 delegate()->UpdateTargetURL(this, url); 1645 delegate()->UpdateTargetURL(this, url);
1646 } 1646 }
1647 1647
1648 void TabContents::UpdateThumbnail(const GURL& url, 1648 void TabContents::UpdateThumbnail(const GURL& url,
1649 const SkBitmap& bitmap, 1649 const SkBitmap& bitmap,
1650 const ThumbnailScore& score) { 1650 const ThumbnailScore& score) {
1651 // Tell History about this thumbnail 1651 // Tell History about this thumbnail
1652 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kThumbnailStore)) { 1652 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kThumbnailStore)) {
1653 if (!profile()->IsOffTheRecord()) 1653 profile()->GetThumbnailStore()->
1654 profile()->GetThumbnailStore()->SetPageThumbnail(url, bitmap, score); 1654 SetPageThumbnail(url, bitmap, score, !profile()->IsOffTheRecord());
1655 } else { 1655 } else {
1656 HistoryService* hs; 1656 HistoryService* hs;
1657 if (!profile()->IsOffTheRecord() && 1657 if (!profile()->IsOffTheRecord() &&
1658 (hs = profile()->GetHistoryService(Profile::IMPLICIT_ACCESS))) { 1658 (hs = profile()->GetHistoryService(Profile::IMPLICIT_ACCESS))) {
1659 hs->SetPageThumbnail(url, bitmap, score); 1659 hs->SetPageThumbnail(url, bitmap, score);
1660 } 1660 }
1661 } 1661 }
1662 } 1662 }
1663 1663
1664 void TabContents::UpdateInspectorSettings(const std::wstring& raw_settings) { 1664 void TabContents::UpdateInspectorSettings(const std::wstring& raw_settings) {
(...skipping 694 matching lines...) Expand 10 before | Expand all | Expand 10 after
2359 NavigationController::LoadCommittedDetails& committed_details = 2359 NavigationController::LoadCommittedDetails& committed_details =
2360 *(Details<NavigationController::LoadCommittedDetails>(details).ptr()); 2360 *(Details<NavigationController::LoadCommittedDetails>(details).ptr());
2361 ExpireInfoBars(committed_details); 2361 ExpireInfoBars(committed_details);
2362 break; 2362 break;
2363 } 2363 }
2364 2364
2365 default: 2365 default:
2366 NOTREACHED(); 2366 NOTREACHED();
2367 } 2367 }
2368 } 2368 }
OLDNEW
« no previous file with comments | « chrome/browser/profile.cc ('k') | chrome/browser/thumbnail_store.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698