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

Side by Side Diff: chrome/browser/sidebar/sidebar_manager.cc

Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 4 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
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/sidebar/sidebar_manager.h" 5 #include "chrome/browser/sidebar/sidebar_manager.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
11 #include "chrome/browser/extensions/extension_sidebar_api.h" 11 #include "chrome/browser/extensions/extension_sidebar_api.h"
12 #include "chrome/browser/pref_service.h" 12 #include "chrome/browser/prefs/pref_service.h"
13 #include "chrome/browser/profile.h" 13 #include "chrome/browser/profile.h"
14 #include "chrome/browser/tab_contents/tab_contents.h" 14 #include "chrome/browser/tab_contents/tab_contents.h"
15 #include "chrome/browser/sidebar/sidebar_container.h" 15 #include "chrome/browser/sidebar/sidebar_container.h"
16 #include "chrome/common/chrome_switches.h" 16 #include "chrome/common/chrome_switches.h"
17 #include "chrome/common/notification_service.h" 17 #include "chrome/common/notification_service.h"
18 #include "chrome/common/pref_names.h" 18 #include "chrome/common/pref_names.h"
19 #include "googleurl/src/gurl.h" 19 #include "googleurl/src/gurl.h"
20 20
21 // static 21 // static
22 SidebarManager* SidebarManager::GetInstance() { 22 SidebarManager* SidebarManager::GetInstance() {
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 314
315 DCHECK(GetSidebarContainerFor(tab, content_id) == sidebar_host); 315 DCHECK(GetSidebarContainerFor(tab, content_id) == sidebar_host);
316 DCHECK(sidebar_host_to_tab_.find(sidebar_host)->second == tab); 316 DCHECK(sidebar_host_to_tab_.find(sidebar_host)->second == tab);
317 DCHECK(tab_to_sidebar_host_[tab].active_content_id != content_id); 317 DCHECK(tab_to_sidebar_host_[tab].active_content_id != content_id);
318 318
319 tab_to_sidebar_host_[tab].content_id_to_sidebar_host.erase(content_id); 319 tab_to_sidebar_host_[tab].content_id_to_sidebar_host.erase(content_id);
320 if (tab_to_sidebar_host_[tab].content_id_to_sidebar_host.empty()) 320 if (tab_to_sidebar_host_[tab].content_id_to_sidebar_host.empty())
321 tab_to_sidebar_host_.erase(tab); 321 tab_to_sidebar_host_.erase(tab);
322 sidebar_host_to_tab_.erase(sidebar_host); 322 sidebar_host_to_tab_.erase(sidebar_host);
323 } 323 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698