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

Side by Side Diff: chrome/browser/sessions/session_service.cc

Issue 10702029: Move tab functions off Browser into browser_tabstrip and browser_tabrestore. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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
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/sessions/session_service.h" 5 #include "chrome/browser/sessions/session_service.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/bind_helpers.h" 13 #include "base/bind_helpers.h"
14 #include "base/command_line.h" 14 #include "base/command_line.h"
15 #include "base/file_util.h" 15 #include "base/file_util.h"
16 #include "base/memory/scoped_vector.h" 16 #include "base/memory/scoped_vector.h"
17 #include "base/message_loop.h" 17 #include "base/message_loop.h"
18 #include "base/metrics/histogram.h" 18 #include "base/metrics/histogram.h"
19 #include "base/pickle.h" 19 #include "base/pickle.h"
20 #include "base/threading/thread.h" 20 #include "base/threading/thread.h"
21 #include "chrome/browser/extensions/extension_tab_helper.h" 21 #include "chrome/browser/extensions/extension_tab_helper.h"
22 #include "chrome/browser/prefs/session_startup_pref.h" 22 #include "chrome/browser/prefs/session_startup_pref.h"
23 #include "chrome/browser/profiles/profile.h" 23 #include "chrome/browser/profiles/profile.h"
24 #include "chrome/browser/sessions/restore_tab_helper.h" 24 #include "chrome/browser/sessions/restore_tab_helper.h"
25 #include "chrome/browser/sessions/session_backend.h" 25 #include "chrome/browser/sessions/session_backend.h"
26 #include "chrome/browser/sessions/session_command.h" 26 #include "chrome/browser/sessions/session_command.h"
27 #include "chrome/browser/sessions/session_restore.h" 27 #include "chrome/browser/sessions/session_restore.h"
28 #include "chrome/browser/sessions/session_types.h" 28 #include "chrome/browser/sessions/session_types.h"
29 #include "chrome/browser/ui/browser_list.h" 29 #include "chrome/browser/ui/browser_list.h"
30 #include "chrome/browser/ui/browser_tabstrip.h"
30 #include "chrome/browser/ui/browser_window.h" 31 #include "chrome/browser/ui/browser_window.h"
31 #include "chrome/browser/ui/startup/startup_browser_creator.h" 32 #include "chrome/browser/ui/startup/startup_browser_creator.h"
32 #include "chrome/browser/ui/tab_contents/tab_contents.h" 33 #include "chrome/browser/ui/tab_contents/tab_contents.h"
33 #include "chrome/browser/ui/tabs/tab_strip_model.h" 34 #include "chrome/browser/ui/tabs/tab_strip_model.h"
34 #include "chrome/common/chrome_notification_types.h" 35 #include "chrome/common/chrome_notification_types.h"
35 #include "chrome/common/extensions/extension.h" 36 #include "chrome/common/extensions/extension.h"
36 #include "content/public/browser/navigation_details.h" 37 #include "content/public/browser/navigation_details.h"
37 #include "content/public/browser/navigation_entry.h" 38 #include "content/public/browser/navigation_entry.h"
38 #include "content/public/browser/notification_details.h" 39 #include "content/public/browser/notification_details.h"
39 #include "content/public/browser/notification_service.h" 40 #include "content/public/browser/notification_service.h"
(...skipping 1335 matching lines...) Expand 10 before | Expand all | Expand 10 after
1375 1376
1376 if (!browser->app_name().empty()) { 1377 if (!browser->app_name().empty()) {
1377 commands->push_back(CreateSetWindowAppNameCommand( 1378 commands->push_back(CreateSetWindowAppNameCommand(
1378 kCommandSetWindowAppName, 1379 kCommandSetWindowAppName,
1379 browser->session_id().id(), 1380 browser->session_id().id(),
1380 browser->app_name())); 1381 browser->app_name()));
1381 } 1382 }
1382 1383
1383 bool added_to_windows_to_track = false; 1384 bool added_to_windows_to_track = false;
1384 for (int i = 0; i < browser->tab_count(); ++i) { 1385 for (int i = 0; i < browser->tab_count(); ++i) {
1385 TabContents* tab = browser->GetTabContentsAt(i); 1386 TabContents* tab = chrome::GetTabContentsAt(browser, i);
1386 DCHECK(tab); 1387 DCHECK(tab);
1387 if (tab->profile() == profile() || profile() == NULL) { 1388 if (tab->profile() == profile() || profile() == NULL) {
1388 BuildCommandsForTab(browser->session_id(), tab, i, 1389 BuildCommandsForTab(browser->session_id(), tab, i,
1389 browser->IsTabPinned(i), 1390 browser->tab_strip_model()->IsTabPinned(i),
1390 commands, tab_to_available_range); 1391 commands, tab_to_available_range);
1391 if (windows_to_track && !added_to_windows_to_track) { 1392 if (windows_to_track && !added_to_windows_to_track) {
1392 windows_to_track->insert(browser->session_id().id()); 1393 windows_to_track->insert(browser->session_id().id());
1393 added_to_windows_to_track = true; 1394 added_to_windows_to_track = true;
1394 } 1395 }
1395 } 1396 }
1396 } 1397 }
1397 commands->push_back( 1398 commands->push_back(
1398 CreateSetSelectedTabInWindow(browser->session_id(), 1399 CreateSetSelectedTabInWindow(browser->session_id(),
1399 browser->active_index())); 1400 browser->active_index()));
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
1724 50); 1725 50);
1725 if (use_long_period) { 1726 if (use_long_period) {
1726 std::string long_name_("SessionRestore.SaveLongPeriod"); 1727 std::string long_name_("SessionRestore.SaveLongPeriod");
1727 UMA_HISTOGRAM_CUSTOM_TIMES(long_name_, 1728 UMA_HISTOGRAM_CUSTOM_TIMES(long_name_,
1728 delta, 1729 delta,
1729 save_delay_in_mins_, 1730 save_delay_in_mins_,
1730 save_delay_in_hrs_, 1731 save_delay_in_hrs_,
1731 50); 1732 50);
1732 } 1733 }
1733 } 1734 }
OLDNEW
« no previous file with comments | « chrome/browser/sessions/session_restore_browsertest.cc ('k') | chrome/browser/speech/speech_recognition_bubble_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698